Better bluetooth disconnect detection

Author: TebbeUbben

app/src/main/AndroidManifest.xml

@@ -101,6 +101,12 @@
             android:name="sugar.free.sightparser.handling.SightService"
             android:exported="true"
             android:process="sugar.free.sightparser.handling.SightService" />
+
+        <receiver android:name=".receivers.ACLReceiver">
+            <intent-filter>
+                <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>

app/src/main/java/sugar/free/sightremote/SightRemote.java

@@ -11,14 +11,16 @@
 import lombok.Getter;
 import sugar.free.sightparser.handling.HistoryBroadcast;
 import sugar.free.sightparser.handling.SightService;
+import sugar.free.sightparser.handling.SightServiceConnector;
 import sugar.free.sightremote.services.AlertService;
 import sugar.free.sightremote.services.HistorySyncService;
 
 public class SightRemote extends Application {
 
     @Getter
     private static SightRemote instance;
-
+    @Getter
+    private SightServiceConnector serviceConnector;
 
     @Override
     public void onCreate() {
@@ -28,6 +30,9 @@ public void onCreate() {
         PreferenceManager.setDefaultValues(this, R.xml.settings, true);
 
         instance = this;
+        serviceConnector = new SightServiceConnector(this);
+        serviceConnector.connectToService();
+
         startService(new Intent(this, SightService.class));
         startService(new Intent(this, HistorySyncService.class));
         startService(new Intent(this, AlertService.class));

app/src/main/java/sugar/free/sightremote/receivers/ACLReceiver.java

@@ -0,0 +1,18 @@
+package sugar.free.sightremote.receivers;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import sugar.free.sightparser.handling.SightServiceConnector;
+import sugar.free.sightremote.SightRemote;
+
+public class ACLReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String mac = ((BluetoothDevice) intent.getParcelableExtra("android.bluetooth.device.extra.DEVICE")).getAddress();
+        SightServiceConnector serviceConnector = SightRemote.getInstance().getServiceConnector();
+        if (serviceConnector.isConnectedToService()) serviceConnector.aclDisconnect(mac);
+    }
+}

sightparser/src/main/aidl/sugar/free/sightparser/handling/ISightService.aidl

@@ -17,4 +17,5 @@ interface ISightService {
     void setPassword(String password);
     void setAuthorized(String packageName, boolean allowed);
     void reset();
+    void aclDisconnect(String mac);
 }

sightparser/src/main/java/sugar/free/sightparser/handling/SightService.java

@@ -134,27 +134,30 @@ public void requestMessage(byte[] message, IMessageCallback callback) throws Rem
         @Override
         public long registerStatusCallback(final IStatusCallback callback) throws RemoteException {
             final long id = ++statusIdCounter;
-            DeathRecipient deathRecipient = new DeathRecipient() {
-                @Override
-                public void binderDied() {
-                    Log.d("SightService", "CLIENT DIED - STATUS");
-                    callback.asBinder().unlinkToDeath(statusCallbackDeathRecipients.get(callback), 0);
-                    statusCallbackDeathRecipients.remove(callback);
+            DeathRecipient deathRecipient = () -> {
+                Log.d("SightService", "CLIENT DIED - STATUS");
+                callback.asBinder().unlinkToDeath(statusCallbackDeathRecipients.get(callback), 0);
+                statusCallbackDeathRecipients.remove(callback);
+                synchronized (statusCallbackIds) {
                     statusCallbackIds.remove(id);
                 }
             };
-            statusCallbackDeathRecipients.put(callback, deathRecipient);
-            statusCallbackIds.put(id, callback);
-            callback.asBinder().linkToDeath(deathRecipient, 0);
+            synchronized (statusCallbackIds) {
+                statusCallbackDeathRecipients.put(callback, deathRecipient);
+                statusCallbackIds.put(id, callback);
+                callback.asBinder().linkToDeath(deathRecipient, 0);
+            }
             return id;
         }
 
         @Override
         public void unregisterStatusCallback(long id) throws RemoteException {
-            IStatusCallback callback = statusCallbackIds.get(id);
-            callback.asBinder().unlinkToDeath(statusCallbackDeathRecipients.get(callback), 0);
-            statusCallbackDeathRecipients.remove(callback);
-            statusCallbackIds.remove(id);
+            synchronized (statusCallbackIds) {
+                IStatusCallback callback = statusCallbackIds.get(id);
+                callback.asBinder().unlinkToDeath(statusCallbackDeathRecipients.get(callback), 0);
+                statusCallbackDeathRecipients.remove(callback);
+                statusCallbackIds.remove(id);
+            }
         }
 
         @Override
@@ -248,6 +251,24 @@ public void reset() throws RemoteException {
                 throw new RemoteException("Not authorized");
             }
         }
+
+        @Override
+        public void aclDisconnect(String mac) throws RemoteException {
+            if (verifyAdminCaller("aclDisconnect")) {
+                if (getDataStorage().get("DEVICEMAC").equalsIgnoreCase(mac)) {
+                    try {
+                        if (bluetoothSocket.isConnected()) {
+                            Log.d("SightService", "Received ACL disconnect, closing socket...");
+                            bluetoothSocket.close();
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            } else {
+                throw new RemoteException("Not authorized");
+            }
+        }
     };
     private StatusCallback statusCallback = new StatusCallback() {
         @Override
@@ -262,12 +283,13 @@ public void onStatusChange(Status status) {
                     reconnect = true;
                 }
             }
-            Iterator<IStatusCallback> sc = statusCallbackIds.values().iterator();
-            while (sc.hasNext()) {
-                try {
-                    sc.next().onStatusChange(status.name());
-                } catch (Exception e) {
-                    e.printStackTrace();
+            synchronized (statusCallbackIds) {
+                for (IStatusCallback sc : statusCallbackIds.values()) {
+                    try {
+                        sc.onStatusChange(status.name());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
             }
             Answers.getInstance().logCustom(new CustomEvent("Connection Status Changed")

sightparser/src/main/java/sugar/free/sightparser/handling/SightServiceConnector.java

@@ -219,4 +219,12 @@ public void reset() {
             e.printStackTrace();
         }
     }
+
+    public void aclDisconnect(String mac) {
+        try {
+            boundService.aclDisconnect(mac);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
 }