From 6db72746fb5411a3fce62c49bd2a56eb065bc573 Mon Sep 17 00:00:00 2001
From: kaneki <kaneki.cjb@foxmail.com>
Date: Sat, 14 Mar 2026 15:31:52 +0800
Subject: [PATCH] Android: keep permission dialog cleanup on the main thread

---
 .../ai/openclaw/app/PermissionRequester.kt    | 76 +++++++++++++------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/apps/android/app/src/main/java/ai/openclaw/app/PermissionRequester.kt b/apps/android/app/src/main/java/ai/openclaw/app/PermissionRequester.kt
index a437a5bcc83..b5cd033d270 100644
--- a/apps/android/app/src/main/java/ai/openclaw/app/PermissionRequester.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/app/PermissionRequester.kt
@@ -4,6 +4,8 @@ import android.content.pm.PackageManager
 import android.content.Intent
 import android.Manifest
 import android.net.Uri
+import android.os.Handler
+import android.os.Looper
 import android.provider.Settings
 import androidx.appcompat.app.AlertDialog
 import androidx.activity.ComponentActivity
@@ -24,6 +26,7 @@ import kotlin.coroutines.resume
 class PermissionRequester(private val activity: ComponentActivity) {
   private val mutex = Mutex()
   private var pending: CompletableDeferred<Map<String, Boolean>>? = null
+  private val mainHandler = Handler(Looper.getMainLooper())
 
   private val launcher: ActivityResultLauncher<Array<String>> =
     activity.registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
@@ -95,17 +98,24 @@ class PermissionRequester(private val activity: ComponentActivity) {
         val lifecycle = activity.lifecycle
         var dialog: AlertDialog? = null
         var observer: LifecycleEventObserver? = null
-        observer =
+        val removeObserver = {
+          observer?.let(lifecycle::removeObserver)
+          observer = null
+        }
+        val actualObserver =
           LifecycleEventObserver { _, event ->
             if (event != Lifecycle.Event.ON_DESTROY || !cont.isActive) return@LifecycleEventObserver
             dialog?.dismiss()
-            observer?.let(lifecycle::removeObserver)
+            removeObserver()
             cont.resume(false)
           }
-        lifecycle.addObserver(observer)
+        observer = actualObserver
+        lifecycle.addObserver(actualObserver)
         cont.invokeOnCancellation {
-          observer?.let(lifecycle::removeObserver)
-          dialog?.dismiss()
+          mainHandler.post {
+            removeObserver()
+            dialog?.dismiss()
+          }
         }
         dialog =
           AlertDialog.Builder(activity)
@@ -113,40 +123,58 @@ class PermissionRequester(private val activity: ComponentActivity) {
             .setMessage(buildRationaleMessage(permissions))
             .setPositiveButton("Continue") { _, _ ->
               if (!cont.isActive) return@setPositiveButton
-              observer?.let(lifecycle::removeObserver)
+              removeObserver()
               cont.resume(true)
             }
             .setNegativeButton("Not now") { _, _ ->
               if (!cont.isActive) return@setNegativeButton
-              observer?.let(lifecycle::removeObserver)
+              removeObserver()
               cont.resume(false)
             }
             .setOnCancelListener {
               if (!cont.isActive) return@setOnCancelListener
-              observer?.let(lifecycle::removeObserver)
+              removeObserver()
               cont.resume(false)
             }
             .show()
       }
     }
 
-  private fun showSettingsDialog(permissions: List<String>) {
-    if (activity.isFinishing || activity.isDestroyed) return
-    AlertDialog.Builder(activity)
-      .setTitle("Enable permission in Settings")
-      .setMessage(buildSettingsMessage(permissions))
-      .setPositiveButton("Open Settings") { _, _ ->
-        if (activity.isFinishing || activity.isDestroyed) return@setPositiveButton
-        val intent =
-          Intent(
-            Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-            Uri.fromParts("package", activity.packageName, null),
-          )
-        activity.startActivity(intent)
+  private suspend fun showSettingsDialog(permissions: List<String>) =
+    withContext(Dispatchers.Main) {
+      if (activity.isFinishing || activity.isDestroyed) return@withContext
+      val lifecycle = activity.lifecycle
+      var dialog: AlertDialog? = null
+      var observer: LifecycleEventObserver? = null
+      val removeObserver = {
+        observer?.let(lifecycle::removeObserver)
+        observer = null
       }
-      .setNegativeButton("Cancel", null)
-      .show()
-  }
+      val actualObserver =
+        LifecycleEventObserver { _, event ->
+          if (event != Lifecycle.Event.ON_DESTROY) return@LifecycleEventObserver
+          removeObserver()
+          dialog?.dismiss()
+        }
+      observer = actualObserver
+      lifecycle.addObserver(actualObserver)
+      dialog =
+        AlertDialog.Builder(activity)
+          .setTitle("Enable permission in Settings")
+          .setMessage(buildSettingsMessage(permissions))
+          .setPositiveButton("Open Settings") { _, _ ->
+            if (activity.isFinishing || activity.isDestroyed) return@setPositiveButton
+            val intent =
+              Intent(
+                Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                Uri.fromParts("package", activity.packageName, null),
+              )
+            activity.startActivity(intent)
+          }
+          .setNegativeButton("Cancel", null)
+          .setOnDismissListener { removeObserver() }
+          .show()
+    }
 
   private fun buildRationaleMessage(permissions: List<String>): String {
     val labels = permissions.map { permissionLabel(it) }