feat: auto restart system bridge on debug builds

Author: sds100

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

@@ -154,9 +154,12 @@ class SystemBridgeAutoStarter @Inject constructor(
 
             if (isBoot) {
                 handleAutoStartOnBoot()
-            } else if (BuildConfig.DEBUG) {
-                Timber.i("Auto starting system bridge because debug build")
-                autoStartTypeFlow.first()?.let { autoStart(it) }
+            } else if (BuildConfig.DEBUG && connectionManager.isConnected()) {
+                // This is useful when developing and need to restart the system bridge
+                // after making changes to it.
+                Timber.w("Restarting system bridge on debug build.")
+
+                connectionManager.restartSystemBridge()
             } else {
                 handleAutoStartFromPreVersion4()
             }

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/manager/SystemBridgeConnectionManager.kt

@@ -136,6 +136,12 @@ class SystemBridgeConnectionManagerImpl @Inject constructor(
         }
     }
 
+    override fun restartSystemBridge() {
+        coroutineScope.launch {
+            systemBridgeFlow.value?.let { restartSystemBridge(it) }
+        }
+    }
+
     @SuppressLint("LogNotTimber")
     private suspend fun restartSystemBridge(systemBridge: ISystemBridge) {
         starter.startSystemBridge(executeCommand = { command ->
@@ -256,6 +262,7 @@ interface SystemBridgeConnectionManager {
 
     fun <T> run(block: (ISystemBridge) -> T): KMResult<T>
     fun stopSystemBridge()
+    fun restartSystemBridge()
 
     fun startWithRoot()
     fun startWithShizuku()

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/starter/SystemBridgeStarter.kt

@@ -53,10 +53,17 @@ class SystemBridgeStarter @Inject constructor(
 ) {
     private val userManager by lazy { ctx.getSystemService(UserManager::class.java)!! }
 
-    private val baseApkPath = ctx.applicationInfo.sourceDir
-    private val splitApkPaths: Array<String> = ctx.applicationInfo.splitSourceDirs ?: emptyArray()
-    private val libPath = ctx.applicationInfo.nativeLibraryDir
-    private val packageName = ctx.applicationInfo.packageName
+    // Important! Use getters because the values can change at runtime just after the app process
+    // starts
+    private val baseApkPath: String
+        get() = ctx.applicationInfo.sourceDir
+    private val splitApkPaths: Array<String>
+        get() = ctx.applicationInfo.splitSourceDirs ?: emptyArray()
+    private val libPath: String?
+        get() = ctx.applicationInfo.nativeLibraryDir
+    private val packageName: String
+        get() = ctx.applicationInfo.packageName
+
     private val startMutex: Mutex = Mutex()
 
     private val shizukuStarterConnection: ServiceConnection = object : ServiceConnection {