fix: do not momentarily show pair adb steps after connecting to a wifi network

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/expertmode/SystemBridgeSetupUseCase.kt

@@ -23,13 +23,13 @@ import io.github.sds100.keymapper.system.permissions.PermissionAdapter
 import io.github.sds100.keymapper.system.root.SuAdapter
 import io.github.sds100.keymapper.system.shizuku.ShizukuAdapter
 import javax.inject.Inject
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -58,18 +58,29 @@ class SystemBridgeSetupUseCaseImpl @Inject constructor(
     override val isWarningUnderstood: Flow<Boolean> =
         preferences.get(Keys.isExpertModeWarningUnderstood).map { it ?: false }
 
-    private val isAdbAutoStartAllowed: Flow<Boolean> =
+    private val adbAutoStartEligibility: Flow<AdbAutoStartEligibility> =
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             combine(
                 permissionAdapter.isGrantedFlow(Permission.WRITE_SECURE_SETTINGS),
                 networkAdapter.isWifiConnected,
             ) { isWriteSecureSettingsGranted, isWifiConnected ->
-                isWriteSecureSettingsGranted &&
-                    isWifiConnected &&
-                    systemBridgeSetupController.isAdbPaired()
-            }.flowOn(Dispatchers.IO)
+                isWriteSecureSettingsGranted && isWifiConnected
+            }.flatMapLatest { canCheck ->
+                if (canCheck) {
+                    flow {
+                        emit(AdbAutoStartEligibility.CHECKING)
+                        if (systemBridgeSetupController.isAdbPaired()) {
+                            emit(AdbAutoStartEligibility.ELIGIBLE)
+                        } else {
+                            emit(AdbAutoStartEligibility.NOT_ELIGIBLE)
+                        }
+                    }
+                } else {
+                    flowOf(AdbAutoStartEligibility.NOT_ELIGIBLE)
+                }
+            }
         } else {
-            flowOf(false)
+            flowOf(AdbAutoStartEligibility.NOT_ELIGIBLE)
         }
 
     override fun onUnderstoodWarning() {
@@ -108,11 +119,14 @@ class SystemBridgeSetupUseCaseImpl @Inject constructor(
             if (isConnected) {
                 flowOf(SystemBridgeSetupStep.STARTED)
             } else {
-                isAdbAutoStartAllowed.flatMapLatest { isAdbAutoStartAllowed ->
-                    if (isAdbAutoStartAllowed) {
-                        flowOf(SystemBridgeSetupStep.START_SERVICE)
-                    } else {
-                        combine(
+                adbAutoStartEligibility.flatMapLatest { adbAutoStartEligibility ->
+                    when (adbAutoStartEligibility) {
+                        AdbAutoStartEligibility.ELIGIBLE ->
+                            flowOf(SystemBridgeSetupStep.START_SERVICE)
+
+                        AdbAutoStartEligibility.CHECKING -> emptyFlow()
+
+                        AdbAutoStartEligibility.NOT_ELIGIBLE -> combine(
                             accessibilityServiceAdapter.state,
                             isNotificationPermissionGranted,
                             systemBridgeSetupController.isDeveloperOptionsEnabled,
@@ -347,3 +361,9 @@ interface SystemBridgeSetupUseCase {
 
     suspend fun getShellStartCommand(): KMResult<String>
 }
+
+enum class AdbAutoStartEligibility {
+    ELIGIBLE,
+    CHECKING,
+    NOT_ELIGIBLE,
+}