From d2e345842083fc61526fa903112c59006399ab68 Mon Sep 17 00:00:00 2001
From: liuyunming521520-cell <liuyunming521520@gmail.com>
Date: Fri, 11 Sep 2026 00:03:41 +0800
Subject: [PATCH] Refresh notes after settings recovery

---
 .../android/ui/LocationNotesSheetPresenter.kt  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt
index 3d174302..3f88b4f0 100644
--- a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt
+++ b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt
@@ -127,7 +127,7 @@ private fun LocationNotesErrorSheet(
 ) {
     val context = LocalContext.current
     var locationPermissionRequestAttempted by rememberSaveable { mutableStateOf(false) }
-    var awaitingSystemLocationSettings by rememberSaveable { mutableStateOf(false) }
+    var awaitingLocationSettingsRecovery by rememberSaveable { mutableStateOf(false) }
     val locationPermissionLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.RequestMultiplePermissions()
     ) { permissionResults ->
@@ -143,12 +143,12 @@ private fun LocationNotesErrorSheet(
         }
     }
 
-    LifecycleResumeEffect(awaitingSystemLocationSettings, systemLocationEnabled) {
-        if (awaitingSystemLocationSettings &&
+    LifecycleResumeEffect(awaitingLocationSettingsRecovery, systemLocationEnabled) {
+        if (awaitingLocationSettingsRecovery &&
             systemLocationEnabled &&
             locationManager.syncPermissionState() == LocationChannelManager.PermissionState.AUTHORIZED
         ) {
-            awaitingSystemLocationSettings = false
+            awaitingLocationSettingsRecovery = false
             locationManager.enableLocationServices()
             locationManager.enableLocationChannels()
             locationManager.refreshChannels()
@@ -184,7 +184,7 @@ private fun LocationNotesErrorSheet(
                 Button(onClick = {
                     when {
                         !systemLocationEnabled -> {
-                            awaitingSystemLocationSettings = runCatching {
+                            awaitingLocationSettingsRecovery = runCatching {
                                 context.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS))
                             }.isSuccess
                         }
@@ -192,7 +192,7 @@ private fun LocationNotesErrorSheet(
                             if (locationPermissionRequestAttempted &&
                                 hasPermanentlyDeniedLocationPermission(context)
                             ) {
-                                openAppLocationSettings(context)
+                                awaitingLocationSettingsRecovery = openAppLocationSettings(context)
                             } else {
                                 locationPermissionRequestAttempted = true
                                 locationPermissionLauncher.launch(
@@ -239,12 +239,12 @@ private fun hasPermanentlyDeniedLocationPermission(context: Context): Boolean {
     }
 }
 
-private fun openAppLocationSettings(context: Context) {
-    runCatching {
+private fun openAppLocationSettings(context: Context): Boolean {
+    return runCatching {
         context.startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
             data = Uri.fromParts("package", context.packageName, null)
         })
-    }
+    }.isSuccess
 }
 
 private tailrec fun Context.findActivity(): Activity? = when (this) {