Update deep analysis

Author: Semper-Viventem

app/src/main/java/f/cking/software/domain/interactor/DeviceServicesFetchingPlanner.kt

@@ -197,20 +197,21 @@ class DeviceServicesFetchingPlanner(
                 || !recentlyChecked
     }
 
-    private fun tooMachConnections() {
-        maxPossibleConnections = parallelProcessingBatches - 1
-        parallelProcessingBatches = max(1, (parallelProcessingBatches * 0.5).toInt())
+    private fun decreaseMaxConnections() {
+        parallelProcessingBatches = max(MIN_PARALLEL_CONNECTIONS, parallelProcessingBatches - 1)
     }
 
     private fun increaseConnections() {
-        parallelProcessingBatches = min(max(1, (parallelProcessingBatches * 1.2).toInt()), maxPossibleConnections)
+        parallelProcessingBatches = min(parallelProcessingBatches + 1, MAX_PARALLEL_CONNECTIONS)
     }
 
     companion object {
-        private const val PARALLEL_BATCH_COUNT = 7
+        private const val PARALLEL_BATCH_COUNT = 7 // usually 7 parallel connections are stable
+        private const val MIN_PARALLEL_CONNECTIONS = 2
+        private const val MAX_PARALLEL_CONNECTIONS = 15
         private const val CHECK_INTERVAL_PER_DEVICE_MIN = 10
         private const val JOURNAL_REPORT_COOLDOWN_MIN = 30
-        private const val DEVICE_FETCH_TIMEOUT_SEC = 5
+        private const val DEVICE_FETCH_TIMEOUT_SEC = 8
         private const val TOTAL_FETCH_TIMEOUT_SEC = 30
         private const val MIN_COOLDOWN_DURATION_MINS = 1
         private const val TAG = "DeviceServicesFetchingPlanner"

app/src/main/java/f/cking/software/domain/interactor/FetchDeviceServiceInfo.kt

@@ -9,6 +9,7 @@ import f.cking.software.domain.model.DeviceData
 import f.cking.software.domain.model.DeviceMetadata
 import f.cking.software.domain.model.DeviceMetadata.CharacteristicType
 import f.cking.software.domain.model.DeviceMetadata.ServiceTypes
+import f.cking.software.domain.model.isNullOrEmpty
 import f.cking.software.fromBase64
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
@@ -72,6 +73,12 @@ class FetchDeviceServiceInfo(
                 }
             }
 
+            fun throwIfMetadataNotUpdated(e: Exception) {
+                if (metadata.isNullOrEmpty() || metadata == device.metadata) {
+                    throw e
+                }
+            }
+
             bleScannerHelper.connectToDevice(device.address)
                 .collect { event ->
                     when (event) {
@@ -161,38 +168,38 @@ class FetchDeviceServiceInfo(
                         // Error handling
                         is BleScannerHelper.DeviceConnectResult.DisconnectedWithError.UnspecifiedConnectionError -> {
                             Timber.tag(TAG).e("Unspecified connection error from ${device.address}.")
-                            disconnect(event.gatt)
-                            throw BluetoothConnectionException.UnspecifiedConnectionError(event.errorCode)
+                            throwIfMetadataNotUpdated(BluetoothConnectionException.UnspecifiedConnectionError(event.errorCode))
+                            submitMetadata()
                         }
 
                         is BleScannerHelper.DeviceConnectResult.DisconnectedWithError.ConnectionTimeout -> {
                             Timber.tag(TAG).e("Connection timeout error from ${device.address}")
-                            disconnect(event.gatt)
-                            throw BluetoothConnectionException.ConnectionTimeoutException(event.errorCode)
+                            throwIfMetadataNotUpdated(BluetoothConnectionException.ConnectionTimeoutException(event.errorCode))
+                            submitMetadata()
                         }
 
                         is BleScannerHelper.DeviceConnectResult.DisconnectedWithError.ConnectionFailedToEstablish -> {
                             Timber.tag(TAG).e("Connection failed to establish error from ${device.address}")
-                            disconnect(event.gatt)
-                            throw BluetoothConnectionException.ConnectionFailedToEstablish(event.errorCode)
+                            throwIfMetadataNotUpdated(BluetoothConnectionException.ConnectionFailedToEstablish(event.errorCode))
+                            submitMetadata()
                         }
 
                         is BleScannerHelper.DeviceConnectResult.DisconnectedWithError.ConnectionFailedBeforeInitializing -> {
                             Timber.tag(TAG).e("Connection initializing failed error from ${device.address}")
-                            disconnect(event.gatt)
-                            throw BluetoothConnectionException.ConnectionInitializingFailed(event.errorCode)
+                            throwIfMetadataNotUpdated(BluetoothConnectionException.ConnectionInitializingFailed(event.errorCode))
+                            submitMetadata()
                         }
 
                         is BleScannerHelper.DeviceConnectResult.DisconnectedWithError.ConnectionTerminated -> {
                             Timber.tag(TAG).e("Connection terminated error from ${device.address}. Probably max GATT connections reached")
-                            disconnect(event.gatt)
-                            throw BluetoothConnectionException.ConnectionTerminated(event.errorCode)
+                            throwIfMetadataNotUpdated(BluetoothConnectionException.ConnectionTerminated(event.errorCode))
+                            submitMetadata()
                         }
 
                         is BleScannerHelper.DeviceConnectResult.DisconnectedWithError.ConnectionFailedTooManyClients -> {
                             Timber.tag(TAG).e("Connection failed due to too many clients error from ${device.address}")
-                            disconnect(event.gatt)
-                            throw BluetoothConnectionException.TooManyClients(event.errorCode)
+                            throwIfMetadataNotUpdated(BluetoothConnectionException.TooManyClients(event.errorCode))
+                            submitMetadata()
                         }
 
                         else -> {