DexShareCollectionService invalid address catch

NightscoutFoundation · Nov 2, 2016 · 82d3a23 · 82d3a23
1 parent 60b7351
commit 82d3a23
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/Services/DexShareCollectionService.java
@@ -255,13 +255,19 @@ public void attemptConnection() {
                     mDeviceName = btDevice.name;
                     mDeviceAddress = btDevice.address;
                     mBluetoothAdapter = mBluetoothManager.getAdapter();
-                    if (mBluetoothAdapter.isEnabled() && mBluetoothAdapter.getRemoteDevice(mDeviceAddress) != null) {
-                        connect(mDeviceAddress);
-                        return;
-                    } else {
-                        Log.w(TAG, "Bluetooth is disabled or BT device cant be found");
-                        setRetryTimer();
-                        return;
+                    try {
+                        if (mBluetoothAdapter.isEnabled() && mBluetoothAdapter.getRemoteDevice(mDeviceAddress) != null) {
+                            connect(mDeviceAddress);
+                            return;
+                        } else {
+                            Log.w(TAG, "Bluetooth is disabled or BT device cant be found");
+                            setRetryTimer();
+                            return;
+                        }
+                    } catch (IllegalArgumentException e) {
+                        if (JoH.ratelimit("dex-share-error-log", 180)) {
+                            Log.wtf(TAG, "Error connecting: " + e);
+                        }
                     }
                 } else {
                     Log.w(TAG, "No bluetooth device to try and connect to");