From 3fead10ea266b4af416b452621fb9071be041153 Mon Sep 17 00:00:00 2001
From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:19:05 +0700
Subject: [PATCH] android, desktop: show alert when import database is failed
 or succeeded (#5402)

---
 .../chat/simplex/common/views/database/DatabaseView.kt     | 7 ++++---
 .../chat/simplex/common/views/migration/MigrateToDevice.kt | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
index bf59524a06..28772f01d3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
@@ -60,8 +60,7 @@ fun DatabaseView() {
     if (to != null) {
       importArchiveAlert {
         stopChatRunBlockStartChat(stopped, chatLastStart, progressIndicator) {
-          importArchive(to, appFilesCountAndSize, progressIndicator)
-          true
+          importArchive(to, appFilesCountAndSize, progressIndicator, false)
         }
       }
     }
@@ -645,6 +644,7 @@ suspend fun importArchive(
   importedArchiveURI: URI,
   appFilesCountAndSize: MutableState<Pair<Int, Long>>,
   progressIndicator: MutableState<Boolean>,
+  migration: Boolean
 ): Boolean {
   val m = chatModel
   progressIndicator.value = true
@@ -666,12 +666,13 @@ suspend fun importArchive(
           if (chatModel.localUserCreated.value == false) {
             chatModel.chatRunning.value = false
           }
+          return true
         } else {
           operationEnded(m, progressIndicator) {
             showArchiveImportedWithErrorsAlert(archiveErrors)
           }
+          return migration
         }
-        return true
       } catch (e: Error) {
         operationEnded(m, progressIndicator) {
           AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_importing_database), e.toString())
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 788c07a9d2..6baa4952b4 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
@@ -239,7 +239,7 @@ private fun ArchiveImportView(progressIndicator: MutableState<Boolean>, close: (
   val importArchiveLauncher = rememberFileChooserLauncher(true) { to: URI? ->
     if (to != null) {
       withLongRunningApi {
-        val success = importArchive(to, mutableStateOf(0 to 0), progressIndicator)
+        val success = importArchive(to, mutableStateOf(0 to 0), progressIndicator, true)
         if (success) {
           startChat(
             chatModel,