fix: catch unbindUserService error

gkd-kit · Dec 20, 2024 · 277a3ab · 277a3ab
1 parent 7ed881a
commit 277a3ab
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/shizuku/ShizukuApi.kt b/app/src/main/kotlin/li/songe/gkd/shizuku/ShizukuApi.kt
@@ -161,8 +161,14 @@ fun safeGetTopActivity(): TopActivity? {
 private fun unbindUserService(serviceArgs: Shizuku.UserServiceArgs, connection: ServiceConnection) {
     LogUtils.d("unbindUserService", serviceArgs)
     // https://github.com/RikkaApps/Shizuku-API/blob/master/server-shared/src/main/java/rikka/shizuku/server/UserServiceManager.java#L62
-    Shizuku.unbindUserService(serviceArgs, connection, false)
-    Shizuku.unbindUserService(serviceArgs, connection, true)
+    try {
+        Shizuku.unbindUserService(serviceArgs, connection, false)
+        Shizuku.unbindUserService(serviceArgs, connection, true)
+    } catch (e: Exception) {
+        // binder haven't been received
+        e.printStackTrace()
+        LogUtils.d(e)
+    }
 }
 
 data class UserServiceWrapper(