fix: refresh the system bridge starter script when the app launches in case the paths changed

Author: sds100

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

@@ -67,7 +67,7 @@ class SystemBridgeConnectionManagerImpl @Inject constructor(
                 time = SystemClock.elapsedRealtime(),
                 // Get whether the user previously stopped the system bridge.
                 isStoppedByUser =
-                preferences.get(Keys.isSystemBridgeStoppedByUser).firstBlocking() ?: false,
+                    preferences.get(Keys.isSystemBridgeStoppedByUser).firstBlocking() ?: false,
             ),
         )
     private var isExpectedDeath: Boolean = false
@@ -93,6 +93,18 @@ class SystemBridgeConnectionManagerImpl @Inject constructor(
         }
     }
 
+    init {
+        // Refresh the starter script because the paths to the apk and libs may
+        // have changed.
+        coroutineScope.launch {
+            try {
+                starter.refreshStarterScript()
+            } catch (e: Exception) {
+                Timber.e("Failed to refresh system bridge starter script", e)
+            }
+        }
+    }
+
     fun pingBinder(): Boolean {
         synchronized(systemBridgeLock) {
             return systemBridgeFlow.value?.asBinder()?.pingBinder() == true

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

@@ -170,11 +170,19 @@ class SystemBridgeStarter @Inject constructor(
         }
     }
 
+    suspend fun refreshStarterScript() {
+        writeStarterScript()
+    }
+
     /**
      * Get the shell command that can be used to start the system bridge manually.
      * This command should be executed with 'adb shell'.
      */
     suspend fun getStartCommand(): KMResult<String> {
+        return writeStarterScript().then { starterPath -> Success("sh $starterPath") }
+    }
+
+    private suspend fun writeStarterScript(): KMResult<String> {
         val directory = if (buildConfigProvider.sdkInt > Build.VERSION_CODES.R) {
             try {
                 ctx.getExternalFilesDir(null)?.parentFile
@@ -196,7 +204,7 @@ class SystemBridgeStarter @Inject constructor(
             protectedStorageDir
         }
 
-        return copyStarterFiles(directory!!).then { starterPath -> Success("sh $starterPath") }
+        return copyStarterFiles(directory!!)
     }
 
     /**