From 39ab56f4943108ef4c4d6204447114eaa58700ed Mon Sep 17 00:00:00 2001
From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
Date: Mon, 23 Dec 2024 23:30:51 +0700
Subject: [PATCH] android: starting service/worker after migrating database
 (#5411)

---
 .../chat/simplex/common/views/migration/MigrateToDevice.kt    | 1 +
 .../common/views/usersettings/NotificationsSettingsView.kt    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt
index 6baa4952b4..1a28bbf589 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt
@@ -691,6 +691,7 @@ private suspend fun finishMigration(appSettings: AppSettings, close: () -> Unit)
     if (user != null) {
       startChat(user)
     }
+    platform.androidChatStartedAfterBeingOff()
     hideView(close)
     AlertManager.shared.showAlertMsg(generalGetString(MR.strings.migrate_to_device_chat_migrated), generalGetString(MR.strings.migrate_to_device_finalize_migration))
   } catch (e: Exception) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NotificationsSettingsView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NotificationsSettingsView.kt
index 66b518e9aa..5af5d5fb90 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NotificationsSettingsView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NotificationsSettingsView.kt
@@ -78,7 +78,7 @@ fun NotificationsSettingsLayout(
         )
       }
       if (platform.androidIsXiaomiDevice() && (notificationsMode.value == NotificationsMode.PERIODIC || notificationsMode.value == NotificationsMode.SERVICE)) {
-        SectionTextFooter(stringResource(MR.strings.xiaomi_ignore_battery_optimization))
+        SectionTextFooter(annotatedStringResource(MR.strings.xiaomi_ignore_battery_optimization))
       }
     }
     SectionBottomSpacer()
@@ -95,7 +95,7 @@ fun NotificationsModeView(
     AppBarTitle(stringResource(MR.strings.settings_notifications_mode_title).lowercase().capitalize(Locale.current))
     SectionViewSelectable(null, notificationsMode, modes, onNotificationsModeSelected)
     if (platform.androidIsXiaomiDevice() && (notificationsMode.value == NotificationsMode.PERIODIC || notificationsMode.value == NotificationsMode.SERVICE)) {
-      SectionTextFooter(stringResource(MR.strings.xiaomi_ignore_battery_optimization))
+      SectionTextFooter(annotatedStringResource(MR.strings.xiaomi_ignore_battery_optimization))
     }
   }
 }