Merge pull request #1685 from smartdevicelink/feature/allow_device_listen_during_connection

Allow SdlDeviceListener to start after BT connection

Author: bilal-alsharifi

android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java

@@ -77,7 +77,8 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport {
     Handler timeOutHandler;
     Runnable socketRunnable;
     boolean keepSocketAlive = true;
-
+    BluetoothDevice connectedDevice;
+    
     /**
      * Constructor. Prepares a new BluetoothChat session.
      *
@@ -112,6 +113,14 @@ public void setKeepSocketAlive(boolean keepSocketAlive) {
         this.keepSocketAlive = keepSocketAlive;
     }
 
+    /**
+     * A method to retrieve the currently connected bluetooth device
+     * @return the connected bluetooth device if connected, null otherwise.
+     */
+    public BluetoothDevice getConnectedDevice(){
+        return connectedDevice;
+    }
+
     /**
      * Start the chat service. Specifically start AcceptThread to begin a
      * session in listening (server) mode. Called by the Activity onResume()
@@ -225,6 +234,7 @@ public synchronized void connected(BluetoothSocket socket, BluetoothDevice devic
 
         //Store a static name of the device that is connected.
         if (device != null) {
+            connectedDevice = device;
             connectedDeviceName = device.getName();
             connectedDeviceAddress = device.getAddress();
             if (connectedDeviceAddress != null) {

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java

@@ -275,9 +275,16 @@ public void onComplete(Vector<ComponentName> routerServices) {
                             DebugTool.logInfo(TAG, ": This app's package: " + myPackage);
                             DebugTool.logInfo(TAG, ": Router service app's package: " + routerServicePackage);
                             if (myPackage != null && myPackage.equalsIgnoreCase(routerServicePackage)) {
-                                SdlDeviceListener sdlDeviceListener = getSdlDeviceListener(context, device);
-                                if (!sdlDeviceListener.isRunning()) {
-                                    sdlDeviceListener.start();
+                                //If the device is not null the listener should start as well as the
+                                //case where this app was installed after BT connected and is the
+                                //only SDL app installed on the device. (Rare corner case)
+                                if(device != null || sdlAppInfoList.size() == 1) {
+                                    SdlDeviceListener sdlDeviceListener = getSdlDeviceListener(context, device);
+                                    if (!sdlDeviceListener.isRunning()) {
+                                        sdlDeviceListener.start();
+                                    }
+                                } else {
+                                    DebugTool.logInfo(TAG, "Not starting device listener, bluetooth device is null and other SDL apps installed.");
                                 }
                             } else {
                                 DebugTool.logInfo(TAG, ": Not the app to start the router service nor device listener");

android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java

@@ -61,7 +61,7 @@ public class SdlDeviceListener {
 
     private final WeakReference<Context> contextWeakReference;
     private final Callback callback;
-    private final BluetoothDevice connectedDevice;
+    private BluetoothDevice connectedDevice;
     private MultiplexBluetoothTransport bluetoothTransport;
     private TransportHandler bluetoothHandler;
     private Handler timeoutHandler;
@@ -87,24 +87,21 @@ public SdlDeviceListener(Context context, BluetoothDevice device, Callback callb
     public void start() {
         if (connectedDevice == null) {
             DebugTool.logInfo(TAG, ": No supplied bluetooth device");
-            if (callback != null) {
-                callback.onTransportError(null);
-            }
-            return;
-        }
-
-        if (hasSDLConnected(contextWeakReference.get(), connectedDevice.getAddress())) {
+        } else if (hasSDLConnected(contextWeakReference.get(), connectedDevice.getAddress())) {
             DebugTool.logInfo(TAG, ": Confirmed SDL device, should start router service");
             //This device has connected to SDL previously, it is ok to start the RS right now
             callback.onTransportConnected(contextWeakReference.get(), connectedDevice);
             return;
         }
+
         synchronized (RUNNING_LOCK) {
             isRunning = true;
             // set timeout = if first time seeing BT device, 30s, if not 15s
-            int timeout = isFirstStatusCheck(connectedDevice.getAddress()) ? 30000 : 15000;
+            int timeout = connectedDevice != null && isFirstStatusCheck(connectedDevice.getAddress()) ? 30000 : 15000;
             //Set our preference as false for this device for now
-            setSDLConnectedStatus(contextWeakReference.get(), connectedDevice.getAddress(), false);
+            if(connectedDevice != null) {
+                setSDLConnectedStatus(contextWeakReference.get(), connectedDevice.getAddress(), false);
+            }
             bluetoothHandler = new TransportHandler(this);
             bluetoothTransport = new MultiplexBluetoothTransport(bluetoothHandler);
             bluetoothTransport.start();
@@ -155,6 +152,9 @@ public void handleMessage(@NonNull Message msg) {
                 case SdlRouterService.MESSAGE_STATE_CHANGE:
                     switch (msg.arg1) {
                         case MultiplexBaseTransport.STATE_CONNECTED:
+                            if(sdlListener.connectedDevice == null) {
+                                sdlListener.connectedDevice = sdlListener.bluetoothTransport.getConnectedDevice();
+                            }
                             sdlListener.setSDLConnectedStatus(sdlListener.contextWeakReference.get(), sdlListener.connectedDevice.getAddress(), true);
                             boolean keepConnectionOpen = sdlListener.callback.onTransportConnected(sdlListener.contextWeakReference.get(), sdlListener.connectedDevice);
                             if (!keepConnectionOpen) {