feat(shizuku): 手动控制在获取授权后是否使用

shier144 · Oct 6, 2023 · b3f7126 · b3f7126
1 parent 97eef8e
commit b3f7126
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 22 deletions.
diff --git a/app/src/main/java/li/songe/gkd/service/GkdAbService.kt b/app/src/main/java/li/songe/gkd/service/GkdAbService.kt
@@ -66,9 +66,9 @@ class GkdAbService : CompositionAbService({
         ManageService.stop(context)
     }
 
-
     val safeGetTasksFc = useSafeGetTasksFc(scope)
     fun getActivityIdByShizuku(): String? {
+        if (!storeFlow.value.enableShizuku) return null
         return safeGetTasksFc()?.lastOrNull()?.topActivity?.className
     }
 

diff --git a/app/src/main/java/li/songe/gkd/shizuku/ShizukuApi.kt b/app/src/main/java/li/songe/gkd/shizuku/ShizukuApi.kt
@@ -3,10 +3,8 @@ package li.songe.gkd.shizuku
 
 import android.app.ActivityManager
 import android.app.IActivityTaskManager
-import android.os.Build
 import android.view.Display
 import com.blankj.utilcode.util.LogUtils
-import com.blankj.utilcode.util.RomUtils
 import com.blankj.utilcode.util.ToastUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -16,10 +14,12 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import li.songe.gkd.composition.CanOnDestroy
 import li.songe.gkd.data.DeviceInfo
 import li.songe.gkd.util.launchWhile
+import li.songe.gkd.util.storeFlow
 import rikka.shizuku.Shizuku
 import rikka.shizuku.ShizukuBinderWrapper
 import rikka.shizuku.SystemServiceHelper
@@ -30,9 +30,6 @@ import kotlin.reflect.typeOf
  * https://github.com/gkd-kit/gkd/issues/44
  */
 
-val skipShizuku by lazy {
-    Build.VERSION.SDK_INT == Build.VERSION_CODES.P && RomUtils.isVivo()
-}
 
 fun newActivityTaskManager(): IActivityTaskManager? {
     return SystemServiceHelper.getSystemService("activity_task").let(::ShizukuBinderWrapper)
@@ -89,19 +86,18 @@ fun CanOnDestroy.useShizukuAliveState(): StateFlow<Boolean> {
 }
 
 fun CanOnDestroy.useSafeGetTasksFc(scope: CoroutineScope): () -> List<ActivityManager.RunningTaskInfo>? {
-    if (skipShizuku) {
-        return { null }
-    }
     val shizukuAliveFlow = useShizukuAliveState()
     val shizukuGrantFlow = MutableStateFlow(false)
     scope.launchWhile(Dispatchers.IO) {
         shizukuGrantFlow.value = if (shizukuAliveFlow.value) shizukuIsSafeOK() else false
         delay(3000)
     }
-    val activityTaskManagerFlow =
-        combine(shizukuAliveFlow, shizukuGrantFlow) { shizukuAlive, shizukuGrant ->
-            if (shizukuAlive && shizukuGrant) newActivityTaskManager() else null
-        }.flowOn(Dispatchers.IO).stateIn(scope, SharingStarted.Lazily, null)
+    val activityTaskManagerFlow = combine(
+        shizukuAliveFlow,
+        shizukuGrantFlow,
+        storeFlow.map { s -> s.enableShizuku }) { shizukuAlive, shizukuGrant, enableShizuku ->
+        if (enableShizuku && shizukuAlive && shizukuGrant) newActivityTaskManager() else null
+    }.flowOn(Dispatchers.IO).stateIn(scope, SharingStarted.Lazily, null)
     return {
         activityTaskManagerFlow.value?.safeGetTasks()
     }

diff --git a/app/src/main/java/li/songe/gkd/ui/DebugPage.kt b/app/src/main/java/li/songe/gkd/ui/DebugPage.kt
@@ -23,7 +23,6 @@ import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -91,14 +90,6 @@ fun DebugPage() {
             verticalArrangement = Arrangement.spacedBy(10.dp),
         ) {
             val shizukuIsOk by usePollState { shizukuIsSafeOK() }
-            LaunchedEffect(key1 = shizukuIsOk, block = {
-                if (shizukuIsOk) {
-//                    check method type
-                    appScope.launchTry(Dispatchers.IO) {
-                        newActivityTaskManager()?.safeGetTasks()
-                    }
-                }
-            })
             if (!shizukuIsOk) {
                 AuthCard(title = "Shizuku授权",
                     desc = "高级运行模式,能更准确识别界面活动ID",
@@ -110,6 +101,33 @@ fun DebugPage() {
                         }
                     })
                 Divider()
+            } else {
+                TextSwitch(name = "Shizuku模式",
+                    desc = "高级运行模式,能更准确识别界面活动ID",
+                    checked = store.enableShizuku,
+                    onCheckedChange = { enableShizuku ->
+                        if (enableShizuku) {
+                            appScope.launchTry(Dispatchers.IO) {
+                                // 检验方法是否适配, 再允许使用 shizuku
+                                val tasks = newActivityTaskManager()?.safeGetTasks()?.firstOrNull()
+                                if (tasks != null) {
+                                    updateStorage(
+                                        storeFlow, store.copy(
+                                            enableShizuku = true
+                                        )
+                                    )
+                                }
+                            }
+                        } else {
+                            updateStorage(
+                                storeFlow, store.copy(
+                                    enableShizuku = false
+                                )
+                            )
+                        }
+
+                    })
+                Divider()
             }
 
             val httpServerRunning by usePollState { HttpService.isRunning() }

diff --git a/app/src/main/java/li/songe/gkd/util/Store.kt b/app/src/main/java/li/songe/gkd/util/Store.kt
@@ -86,6 +86,7 @@ data class Store(
     val clickToast: String = "跳过",
     val autoClearMemorySubs: Boolean = true,
     val hideSnapshotStatusBar: Boolean = false,
+    val enableShizuku: Boolean = false,
 ) : Parcelable
 
 val storeFlow by lazy {