#1916 fix refactoring of root checks to not hang the entire app

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/promode/SystemBridgeAutoStarter.kt

@@ -46,6 +46,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
+import kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
 
 /**
@@ -78,45 +79,47 @@ class SystemBridgeAutoStarter @Inject constructor(
     @SuppressLint("NewApi")
     @OptIn(ExperimentalCoroutinesApi::class)
     private val autoStartTypeFlow: Flow<AutoStartType?> =
-        suAdapter.isRootGranted.flatMapLatest { isRooted ->
-            if (isRooted) {
-                flowOf(AutoStartType.ROOT)
-            } else {
-                val useShizukuFlow =
-                    combine(
-                        shizukuAdapter.isStarted,
-                        permissionAdapter.isGrantedFlow(Permission.SHIZUKU),
-                    ) { isStarted, isGranted ->
-                        isStarted && isGranted
-                    }
-
-                useShizukuFlow.flatMapLatest { useShizuku ->
-                    if (useShizuku) {
-                        flowOf(AutoStartType.SHIZUKU)
-                    } else if (buildConfig.sdkInt >= Build.VERSION_CODES.R) {
-                        val isAdbAutoStartAllowed = combine(
-                            permissionAdapter.isGrantedFlow(Permission.WRITE_SECURE_SETTINGS),
-                            networkAdapter.isWifiConnected,
-                        ) { isWriteSecureSettingsGranted, isWifiConnected ->
-                            isWriteSecureSettingsGranted &&
-                                isWifiConnected &&
-                                setupController.isAdbPaired()
+        suAdapter.isRootGranted
+            .filterNotNull()
+            .flatMapLatest { isRooted ->
+                if (isRooted) {
+                    flowOf(AutoStartType.ROOT)
+                } else {
+                    val useShizukuFlow =
+                        combine(
+                            shizukuAdapter.isStarted,
+                            permissionAdapter.isGrantedFlow(Permission.SHIZUKU),
+                        ) { isStarted, isGranted ->
+                            isStarted && isGranted
                         }
 
-                        isAdbAutoStartAllowed.distinctUntilChanged()
-                            .map { isAdbAutoStartAllowed ->
-                                if (isAdbAutoStartAllowed) {
-                                    AutoStartType.ADB
-                                } else {
-                                    null
-                                }
-                            }.filterNotNull()
-                    } else {
-                        flowOf(null)
+                    useShizukuFlow.flatMapLatest { useShizuku ->
+                        if (useShizuku) {
+                            flowOf(AutoStartType.SHIZUKU)
+                        } else if (buildConfig.sdkInt >= Build.VERSION_CODES.R) {
+                            val isAdbAutoStartAllowed = combine(
+                                permissionAdapter.isGrantedFlow(Permission.WRITE_SECURE_SETTINGS),
+                                networkAdapter.isWifiConnected,
+                            ) { isWriteSecureSettingsGranted, isWifiConnected ->
+                                isWriteSecureSettingsGranted &&
+                                    isWifiConnected &&
+                                    setupController.isAdbPaired()
+                            }
+
+                            isAdbAutoStartAllowed.distinctUntilChanged()
+                                .map { isAdbAutoStartAllowed ->
+                                    if (isAdbAutoStartAllowed) {
+                                        AutoStartType.ADB
+                                    } else {
+                                        null
+                                    }
+                                }.filterNotNull()
+                        } else {
+                            flowOf(null)
+                        }
                     }
                 }
             }
-        }
 
     /**
      * This emits values when the system bridge needs restarting after it being killed.
@@ -187,7 +190,11 @@ class SystemBridgeAutoStarter @Inject constructor(
         @Suppress("DEPRECATION")
         val upgradedFromPreVersion4 = preferences.get(Keys.hasRootPermissionLegacy).first() != null
 
-        if (upgradedFromPreVersion4 && suAdapter.isRootGranted.first()) {
+        val isRooted: Boolean = withTimeoutOrNull(1000) {
+            suAdapter.isRootGranted.filterNotNull().first()
+        } ?: false
+
+        if (upgradedFromPreVersion4 && isRooted) {
             Timber.i(
                 "Auto starting system bridge because upgraded from pre version 4.0 and was rooted",
             )

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

@@ -120,7 +120,7 @@ class SystemBridgeSetupUseCaseImpl @Inject constructor(
             }
         }
 
-    override val isRootGranted: Flow<Boolean> = suAdapter.isRootGranted
+    override val isRootGranted: Flow<Boolean> = suAdapter.isRootGranted.map { it ?: false }
 
     override val shizukuSetupState: Flow<ShizukuSetupState> = combine(
         shizukuAdapter.isInstalled,

base/src/main/java/io/github/sds100/keymapper/base/settings/ConfigSettingsUseCase.kt

@@ -57,7 +57,7 @@ class ConfigSettingsUseCaseImpl @Inject constructor(
             Theme.entries.single { it.value == value.toInt() }
         }
 
-    override val isRootGranted: Flow<Boolean> = suAdapter.isRootGranted
+    override val isRootGranted: Flow<Boolean> = suAdapter.isRootGranted.map { it ?: false }
 
     override val isWriteSecureSettingsGranted: Flow<Boolean> = channelFlow {
         send(permissionAdapter.isGranted(Permission.WRITE_SECURE_SETTINGS))

system/src/main/java/io/github/sds100/keymapper/system/permissions/AndroidPermissionAdapter.kt

@@ -278,7 +278,7 @@ class AndroidPermissionAdapter @Inject constructor(
                 Manifest.permission.SEND_SMS,
             ) == PERMISSION_GRANTED
 
-        Permission.ROOT -> suAdapter.isRootGranted.firstBlocking()
+        Permission.ROOT -> suAdapter.isRootGranted.firstBlocking() ?: false
 
         Permission.IGNORE_BATTERY_OPTIMISATION ->
             powerManager?.isIgnoringBatteryOptimizations(buildConfigProvider.packageName) ?: false

system/src/main/java/io/github/sds100/keymapper/system/root/SuAdapter.kt

@@ -10,7 +10,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -20,15 +19,7 @@ import timber.log.Timber
 class SuAdapterImpl @Inject constructor(private val coroutineScope: CoroutineScope) :
     BaseShellAdapter(),
     SuAdapter {
-    /**
-     * This is initially null while it waits for the invalidateJob to complete asynchronously.
-     */
-    private val _isRootGranted: MutableStateFlow<Boolean?> = MutableStateFlow(null)
-
-    /**
-     * This flow will block until the invalidateJob is finished.
-     */
-    override val isRootGranted: Flow<Boolean> = _isRootGranted.filterNotNull()
+    override val isRootGranted: MutableStateFlow<Boolean?> = MutableStateFlow(null)
 
     private var invalidateJob: Job? = null
 
@@ -55,7 +46,7 @@ class SuAdapterImpl @Inject constructor(private val coroutineScope: CoroutineSco
         try {
             // Close the shell so a new one is started without root permission.
             val isRooted = getIsRooted()
-            _isRootGranted.update { isRooted }
+            isRootGranted.update { isRooted }
         } catch (e: Exception) {
             Timber.e("Exception invalidating root detection: $e")
         }
@@ -71,7 +62,7 @@ class SuAdapterImpl @Inject constructor(private val coroutineScope: CoroutineSco
 }
 
 interface SuAdapter : ShellAdapter {
-    val isRootGranted: Flow<Boolean>
+    val isRootGranted: Flow<Boolean?>
 
     fun requestPermission()
 }