Dash: Only call BluetoothGatt::connect when reusing the BluetoothGatt object

Author: TebbeUbben

pump/omnipod-dash/src/main/kotlin/app/aaps/pump/omnipod/dash/driver/comm/session/Connection.kt

@@ -71,16 +71,17 @@ class Connection(
         podState.connectionAttempts++
         podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTING
         val autoConnect = false
-        val gatt = gattConnection ?: podDevice.connectGatt(context, autoConnect, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE)
-        gattConnection = gatt
+        var gatt = gattConnection
         if (gatt == null) {
-            Thread.sleep(SLEEP_WHEN_FAILING_TO_CONNECT_GATT) // Do not retry too often
-            throw FailedToConnectException("connectGatt() returned null")
+            gatt = podDevice.connectGatt(context, autoConnect, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE)
+            if (gatt == null) {
+                Thread.sleep(SLEEP_WHEN_FAILING_TO_CONNECT_GATT) // Do not retry too often
+                throw FailedToConnectException("connectGatt() returned null")
+            }
+            gattConnection = gatt
+        } else if (!gatt.connect()) {
+            throw FailedToConnectException("connect() returned false")
         }
-        gatt.connect()
-        // if (!gatt.connect()) {
-        //     throw FailedToConnectException("connect() returned false")
-        // }
         val before = SystemClock.elapsedRealtime()
         if (waitForConnection(connectionWaitCond) !is Connected) {
             podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED