android: fix for disabled notifications (#5431)

* android: fix for disabled notifications * change * prevent showing alert multiple times * changes --------- Co-authored-by: Avently <7953703+avently@users.noreply.github.com>
2026-03-30 18:35:49 +00:00 · 2024-12-25 22:34:55 +00:00
parent 400967b03b
commit 00bc59b3a0
4 changed files with 82 additions and 50 deletions
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
@@ -470,53 +470,65 @@ class SimplexService: Service() {
      )
    }

-    private fun showBGServiceNoticeIgnoreOptimization(mode: NotificationsMode, showOffAlert: Boolean) = AlertManager.shared.showAlert {
-      val ignoreOptimization = {
-        AlertManager.shared.hideAlert()
-        askAboutIgnoringBatteryOptimization()
+    private var showingIgnoreNotification = false
+    private fun showBGServiceNoticeIgnoreOptimization(mode: NotificationsMode, showOffAlert: Boolean) {
+      // that's workaround for situation when the app receives onPause/onResume events multiple times
+      // (for example, after showing system alert for enabling notifications) which triggers showing that alert multiple times
+      if (showingIgnoreNotification) {
+        return
      }
-      val disableNotifications = {
-        AlertManager.shared.hideAlert()
-        disableNotifications(mode, showOffAlert)
-      }
-      AlertDialog(
-        onDismissRequest = disableNotifications,
-        title = {
-          Row {
-            Icon(
-              painterResource(MR.images.ic_bolt),
-              contentDescription =
-              if (mode == NotificationsMode.SERVICE) stringResource(MR.strings.icon_descr_instant_notifications) else stringResource(MR.strings.periodic_notifications),
-            )
-            Text(
-              if (mode == NotificationsMode.SERVICE) stringResource(MR.strings.service_notifications) else stringResource(MR.strings.periodic_notifications),
-              fontWeight = FontWeight.Bold
-            )
-          }
-        },
-        text = {
-          Column {
-            Text(
-              if (mode == NotificationsMode.SERVICE) annotatedStringResource(MR.strings.to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery) else annotatedStringResource(MR.strings.periodic_notifications_desc),
-              Modifier.padding(bottom = 8.dp)
-            )
-            Text(annotatedStringResource(MR.strings.turn_off_battery_optimization))
-
-            if (platform.androidIsXiaomiDevice() && (mode == NotificationsMode.PERIODIC || mode == NotificationsMode.SERVICE)) {
-              Text(annotatedStringResource(MR.strings.xiaomi_ignore_battery_optimization),
-                Modifier.padding(top = 8.dp)
+      showingIgnoreNotification = true
+      AlertManager.shared.showAlert {
+        val ignoreOptimization = {
+          AlertManager.shared.hideAlert()
+          showingIgnoreNotification = false
+          askAboutIgnoringBatteryOptimization()
+        }
+        val disableNotifications = {
+          AlertManager.shared.hideAlert()
+          showingIgnoreNotification = false
+          disableNotifications(mode, showOffAlert)
+        }
+        AlertDialog(
+          onDismissRequest = disableNotifications,
+          title = {
+            Row {
+              Icon(
+                painterResource(MR.images.ic_bolt),
+                contentDescription =
+                  if (mode == NotificationsMode.SERVICE) stringResource(MR.strings.icon_descr_instant_notifications) else stringResource(MR.strings.periodic_notifications),
+              )
+              Text(
+                if (mode == NotificationsMode.SERVICE) stringResource(MR.strings.service_notifications) else stringResource(MR.strings.periodic_notifications),
+                fontWeight = FontWeight.Bold
              )
            }
-          }
-        },
-        dismissButton = {
-          TextButton(onClick = disableNotifications) { Text(stringResource(MR.strings.disable_notifications_button), color = MaterialTheme.colors.error) }
-        },
-        confirmButton = {
-          TextButton(onClick = ignoreOptimization) { Text(stringResource(MR.strings.turn_off_battery_optimization_button)) }
-        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
-      )
+          },
+          text = {
+            Column {
+              Text(
+                if (mode == NotificationsMode.SERVICE) annotatedStringResource(MR.strings.to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery) else annotatedStringResource(MR.strings.periodic_notifications_desc),
+                Modifier.padding(bottom = 8.dp)
+              )
+              Text(annotatedStringResource(MR.strings.turn_off_battery_optimization))
+
+              if (platform.androidIsXiaomiDevice() && (mode == NotificationsMode.PERIODIC || mode == NotificationsMode.SERVICE)) {
+                Text(
+                  annotatedStringResource(MR.strings.xiaomi_ignore_battery_optimization),
+                  Modifier.padding(top = 8.dp)
+                )
+              }
+            }
+          },
+          dismissButton = {
+            TextButton(onClick = disableNotifications) { Text(stringResource(MR.strings.disable_notifications_button), color = MaterialTheme.colors.error) }
+          },
+          confirmButton = {
+            TextButton(onClick = ignoreOptimization) { Text(stringResource(MR.strings.turn_off_battery_optimization_button)) }
+          },
+          shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        )
+      }
    }

    private fun showBGServiceNoticeSystemRestricted(mode: NotificationsMode, showOffAlert: Boolean) = AlertManager.shared.showAlert {
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SetNotificationsMode.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SetNotificationsMode.android.kt
@@ -4,19 +4,31 @@ import android.Manifest
 import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import chat.simplex.common.platform.ntfManager
-import com.google.accompanist.permissions.PermissionStatus
-import com.google.accompanist.permissions.rememberPermissionState
+import chat.simplex.common.model.ChatController.appPrefs
+import chat.simplex.common.platform.*
+import com.google.accompanist.permissions.*

@Composable
 actual fun SetNotificationsModeAdditions() {
  if (Build.VERSION.SDK_INT >= 33) {
    val notificationsPermissionState = rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
    LaunchedEffect(notificationsPermissionState.status == PermissionStatus.Granted) {
-      if (notificationsPermissionState.status == PermissionStatus.Granted) {
-        ntfManager.androidCreateNtfChannelsMaybeShowAlert()
+      val canAsk = appPrefs.canAskToEnableNotifications.get()
+      if (notificationsPermissionState.status is PermissionStatus.Denied) {
+        if (notificationsPermissionState.status.shouldShowRationale || !canAsk) {
+          if (canAsk) {
+            appPrefs.canAskToEnableNotifications.set(false)
+          }
+          Log.w(TAG, "Notifications are disabled and nobody will ask to enable them")
+        } else {
+          notificationsPermissionState.launchPermissionRequest()
+        }
      } else {
-        notificationsPermissionState.launchPermissionRequest()
+        if (!canAsk) {
+          // the user allowed notifications in system alert or manually in settings, allow to ask him next time if needed
+          appPrefs.canAskToEnableNotifications.set(true)
+        }
+        ntfManager.androidCreateNtfChannelsMaybeShowAlert()
      }
    }
  } else {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@@ -80,6 +80,7 @@ class AppPreferences {
    if (!runServiceInBackground.get()) NotificationsMode.OFF else NotificationsMode.default
  )  { NotificationsMode.values().firstOrNull { it.name == this } }
  val notificationPreviewMode = mkStrPreference(SHARED_PREFS_NOTIFICATION_PREVIEW_MODE, NotificationPreviewMode.default.name)
+  val canAskToEnableNotifications = mkBoolPreference(SHARED_PREFS_CAN_ASK_TO_ENABLE_NOTIFICATIONS, true)
  val backgroundServiceNoticeShown = mkBoolPreference(SHARED_PREFS_SERVICE_NOTICE_SHOWN, false)
  val backgroundServiceBatteryNoticeShown = mkBoolPreference(SHARED_PREFS_SERVICE_BATTERY_NOTICE_SHOWN, false)
  val autoRestartWorkerVersion = mkIntPreference(SHARED_PREFS_AUTO_RESTART_WORKER_VERSION, 0)
@@ -358,6 +359,7 @@ class AppPreferences {
    private const val SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND = "RunServiceInBackground"
    private const val SHARED_PREFS_NOTIFICATIONS_MODE = "NotificationsMode"
    private const val SHARED_PREFS_NOTIFICATION_PREVIEW_MODE = "NotificationPreviewMode"
+    private const val SHARED_PREFS_CAN_ASK_TO_ENABLE_NOTIFICATIONS = "CanAskToEnableNotifications"
    private const val SHARED_PREFS_SERVICE_NOTICE_SHOWN = "BackgroundServiceNoticeShown"
    private const val SHARED_PREFS_SERVICE_BATTERY_NOTICE_SHOWN = "BackgroundServiceBatteryNoticeShown"
    private const val SHARED_PREFS_WEBRTC_POLICY_RELAY = "WebrtcPolicyRelay"
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
@@ -187,6 +187,12 @@ fun ChatListView(chatModel: ChatModel, userPickerState: MutableStateFlow<Animate
    }
  }
  if (appPlatform.isAndroid) {
+    val wasAllowedToSetupNotifications = rememberSaveable { mutableStateOf(false) }
+    val canEnableNotifications = remember { derivedStateOf { chatModel.chatRunning.value == true } }
+    if (wasAllowedToSetupNotifications.value || canEnableNotifications.value) {
+      SetNotificationsModeAdditions()
+      LaunchedEffect(Unit) { wasAllowedToSetupNotifications.value = true }
+    }
    tryOrShowError("UserPicker", error = {}) {
      UserPicker(
        chatModel = chatModel,