perf: adapt ITaskStackListener method (#941)

Author: lisonge

app/src/main/kotlin/li/songe/gkd/MainViewModel.kt

@@ -172,10 +172,3 @@ class MainViewModel : ViewModel() {
         }
     }
 }
-
-//private fun saveObjectClass(clazz: KClass<*>) {
-//    val declaredFunctionText = clazz.declaredFunctions.map {
-//        "${it.name}\n(${it.parameters.joinToString { p -> "${p.name}:${p.type}" }}):${it.returnType}"
-//    }.joinToString("\n\n")
-//    filesDir.resolve("object_class.txt").writeText(declaredFunctionText)
-//}

app/src/main/kotlin/li/songe/gkd/shizuku/ActivityTaskManager.kt

@@ -124,11 +124,13 @@ private val taskListener by lazy {
 
 val activityTaskManagerFlow by lazy<StateFlow<SafeActivityTaskManager?>> {
     val stateFlow = MutableStateFlow<SafeActivityTaskManager?>(null)
-    appScope.launchTry(Dispatchers.IO) {
-        shizukuActivityUsedFlow.collect {
-            stateFlow.value?.unregisterTaskStackListener(taskListener)
-            stateFlow.value = if (it) newActivityTaskManager() else null
-            stateFlow.value?.registerTaskStackListener(taskListener)
+    if (TaskListener.unadaptedMethodList.isEmpty()) {
+        appScope.launchTry(Dispatchers.IO) {
+            shizukuActivityUsedFlow.collect {
+                stateFlow.value?.unregisterTaskStackListener(taskListener)
+                stateFlow.value = if (it) newActivityTaskManager() else null
+                stateFlow.value?.registerTaskStackListener(taskListener)
+            }
         }
     }
     stateFlow

app/src/main/kotlin/li/songe/gkd/shizuku/TaskListener.kt

@@ -6,8 +6,26 @@ import android.app.ITaskStackListener
 import android.content.ComponentName
 import android.os.IBinder
 import android.window.TaskSnapshot
+import java.lang.reflect.Modifier
+import kotlin.reflect.full.declaredFunctions
 
 class TaskListener(private val onStackChanged: () -> Unit) : ITaskStackListener.Stub() {
+    companion object {
+        // https://github.com/gkd-kit/gkd/issues/941
+        val unadaptedMethodList by lazy {
+            val allAdaptedMethodList = TaskListener::class.declaredFunctions
+            val currentSystemMethodList =
+                Class.forName("android.app.ITaskStackListener").methods.filter {
+                    it.returnType == Void.TYPE && !it.isDefault && Modifier.isAbstract(it.modifiers) && !Modifier.isStatic(
+                        it.modifiers
+                    )
+                }
+            currentSystemMethodList.filterNot { v1 ->
+                allAdaptedMethodList.any { v2 -> v1.name == v2.name && v1.parameters.size == v2.parameters.size - 1 }
+            }
+        }
+    }
+
     override fun onTaskStackChanged() = onStackChanged()
 
     override fun onActivityPinned(
@@ -137,4 +155,6 @@ class TaskListener(private val onStackChanged: () -> Unit) : ITaskStackListener.
     }
 
     override fun onTaskWindowingModeChanged(i: Int) {}
+    override fun onRecentTaskRemovedForAddTask(taskId: Int) {}
+    override fun onActivityDismissingDockedTask() {}
 }

app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt

@@ -56,6 +56,7 @@ import com.blankj.utilcode.util.LogUtils
 import com.dylanc.activityresult.launcher.launchForResult
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
+import com.ramcosta.composedestinations.generated.destinations.AboutPageDestination
 import com.ramcosta.composedestinations.generated.destinations.ActivityLogPageDestination
 import com.ramcosta.composedestinations.generated.destinations.SnapshotPageDestination
 import com.ramcosta.composedestinations.utils.toDestinationsNavigator
@@ -70,6 +71,7 @@ import li.songe.gkd.permission.canDrawOverlaysState
 import li.songe.gkd.permission.notificationState
 import li.songe.gkd.permission.requiredPermission
 import li.songe.gkd.permission.shizukuOkState
+import li.songe.gkd.shizuku.TaskListener
 import li.songe.gkd.shizuku.shizukuCheckActivity
 import li.songe.gkd.shizuku.shizukuCheckUserService
 import li.songe.gkd.shizuku.shizukuCheckWorkProfile
@@ -125,7 +127,9 @@ fun AdvancedPage() {
                         value = it.filter { c -> c.isDigit() }.take(5)
                     },
                     singleLine = true,
-                    modifier = Modifier.fillMaxWidth().autoFocus(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .autoFocus(),
                     keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
                     supportingText = {
                         Text(
@@ -468,6 +472,8 @@ fun AdvancedPage() {
 
 @Composable
 private fun ShizukuFragment(enabled: Boolean = true) {
+    val mainVm = LocalMainViewModel.current
+    val navController = LocalNavController.current
     val shizukuStore by shizukuStoreFlow.collectAsState()
     TextSwitch(
         title = "界面识别",
@@ -483,6 +489,25 @@ private fun ShizukuFragment(enabled: Boolean = true) {
                     toast("检测失败,无法使用")
                     return@launchAsFn
                 }
+                if (TaskListener.unadaptedMethodList.isNotEmpty()) {
+                    LogUtils.d(
+                        "TaskListener.unadaptedMethodList",
+                        *TaskListener.unadaptedMethodList.map {
+                            "${it.name}(${it.parameters.joinToString { p -> "${p.name}:${p.type}" }}):${it.returnType}"
+                        }.toTypedArray()
+                    )
+                    mainVm.dialogFlow.updateDialogOptions(
+                        onDismissRequest = {},
+                        title = "适配提示",
+                        text = "检测到未适配的 API, 已自动禁用部分功能, 请带上日志反馈",
+                        dismissText = "取消",
+                        confirmText = "去反馈",
+                        confirmAction = {
+                            mainVm.dialogFlow.value = null
+                            navController.toDestinationsNavigator().navigate(AboutPageDestination)
+                        }
+                    )
+                }
                 toast("已启用")
             }
             shizukuStoreFlow.update { s -> s.copy(enableActivity = it) }

app/src/main/kotlin/li/songe/gkd/ui/component/DialogOptions.kt

@@ -94,7 +94,7 @@ fun MutableStateFlow<AlertDialogOptions?>.updateDialogOptions(
         confirmText = confirmText,
         confirmAction = confirmAction ?: { value = null },
         dismissText = dismissText,
-        dismissAction = dismissAction,
+        dismissAction = dismissAction ?: { value = null },
         onDismissRequest = onDismissRequest,
         error = error,
     )

hidden_api/src/main/java/android/app/ITaskStackListener.java

@@ -282,4 +282,9 @@ void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, boolean home
 
     void onTaskWindowingModeChanged(int taskId);
 
+    // https://github.com/gkd-kit/gkd/issues/943
+    void onRecentTaskRemovedForAddTask(int taskId);
+
+    void onActivityDismissingDockedTask();
+
 }