mobile: archive import errors (#2496)

2024-12-17 17:20:21 +01:00 · 2023-05-24 14:22:12 +04:00
parent de33fedea4
commit a1e6d90e31
7 changed files with 55 additions and 14 deletions
@@ -545,9 +545,9 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
    throw Error("failed to export archive: ${r.responseType} ${r.details}")
  }

-  suspend fun apiImportArchive(config: ArchiveConfig) {
+  suspend fun apiImportArchive(config: ArchiveConfig): List<ArchiveError> {
    val r = sendCmd(CC.ApiImportArchive(config))
-    if (r is CR.CmdOk) return
+    if (r is CR.ArchiveImported) return r.archiveErrors
    throw Error("failed to import archive: ${r.responseType} ${r.details}")
  }

@@ -3369,6 +3369,7 @@ sealed class CR {
  @Serializable @SerialName("cmdOk") class CmdOk(val user: User?): CR()
  @Serializable @SerialName("chatCmdError") class ChatCmdError(val user_: User?, val chatError: ChatError): CR()
  @Serializable @SerialName("chatError") class ChatRespError(val user_: User?, val chatError: ChatError): CR()
+  @Serializable @SerialName("archiveImported") class ArchiveImported(val archiveErrors: List<ArchiveError>): CR()
  @Serializable class Response(val type: String, val json: String): CR()
  @Serializable class Invalid(val str: String): CR()

@@ -3478,6 +3479,7 @@ sealed class CR {
    is CmdOk -> "cmdOk"
    is ChatCmdError -> "chatCmdError"
    is ChatRespError -> "chatError"
+    is ArchiveImported -> "archiveImported"
    is Response -> "* $type"
    is Invalid -> "* invalid json"
  }
@@ -3590,6 +3592,7 @@ sealed class CR {
    is CmdOk -> withUser(user, noDetails())
    is ChatCmdError -> withUser(user_, chatError.string)
    is ChatRespError -> withUser(user_, chatError.string)
+    is ArchiveImported -> "${archiveErrors.map { it.string } }"
    is Response -> json
    is Invalid -> str
  }
@@ -3678,6 +3681,7 @@ sealed class ChatErrorType {
    is InvalidConnReq -> "invalidConnReq"
    is FileAlreadyReceiving -> "fileAlreadyReceiving"
    is СommandError -> "commandError $message"
+    is CEException -> "exception $message"
  }
  @Serializable @SerialName("noActiveUser") class NoActiveUser: ChatErrorType()
  @Serializable @SerialName("differentActiveUser") class DifferentActiveUser: ChatErrorType()
@@ -3685,6 +3689,7 @@ sealed class ChatErrorType {
  @Serializable @SerialName("invalidConnReq") class InvalidConnReq: ChatErrorType()
  @Serializable @SerialName("fileAlreadyReceiving") class FileAlreadyReceiving: ChatErrorType()
  @Serializable @SerialName("commandError") class СommandError(val message: String): ChatErrorType()
+  @Serializable @SerialName("exception") class CEException(val message: String): ChatErrorType()
 }

@Serializable
@@ -3896,3 +3901,13 @@ sealed class XFTPErrorType {
  @Serializable @SerialName("FILE_IO") object FILE_IO: XFTPErrorType()
  @Serializable @SerialName("INTERNAL") object INTERNAL: XFTPErrorType()
 }
+
+@Serializable
+sealed class ArchiveError {
+  val string: String get() = when (this) {
+    is ArchiveErrorImport -> "import ${chatError.string}"
+    is ArchiveErrorImportFile -> "importFile $file ${chatError.string}"
+  }
+  @Serializable @SerialName("import") class ArchiveErrorImport(val chatError: ChatError): ArchiveError()
+  @Serializable @SerialName("importFile") class ArchiveErrorImportFile(val file: String, val chatError: ChatError): ArchiveError()
+}
@@ -178,8 +178,7 @@ fun DatabaseLayout(
      val unencrypted = chatDbEncrypted == false
      SettingsActionItem(
        if (unencrypted) painterResource(R.drawable.ic_lock_open) else if (useKeyChain) painterResource(R.drawable.ic_vpn_key_filled)
-        else painterResource(R
-          .drawable.ic_lock),
+        else painterResource(R.drawable.ic_lock),
        stringResource(R.string.database_passphrase),
        click = showSettingsModal() { DatabaseEncryptionView(it) },
        iconColor = if (unencrypted) WarningOrange else MaterialTheme.colors.secondary,
@@ -574,11 +573,17 @@ private fun importArchive(
        m.controller.apiDeleteStorage()
        try {
          val config = ArchiveConfig(archivePath, parentTempDirectory = context.cacheDir.toString())
-          m.controller.apiImportArchive(config)
+          val archiveErrors = m.controller.apiImportArchive(config)
          DatabaseUtils.ksDatabasePassword.remove()
          appFilesCountAndSize.value = directoryFileCountAndSize(getAppFilesDirectory(context))
-          operationEnded(m, progressIndicator) {
-            AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_imported), generalGetString(R.string.restart_the_app_to_use_imported_chat_database))
+          if (archiveErrors.isEmpty()) {
+            operationEnded(m, progressIndicator) {
+              AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_imported), text = generalGetString(R.string.restart_the_app_to_use_imported_chat_database))
+            }
+          } else {
+            operationEnded(m, progressIndicator) {
+              AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_imported), text = generalGetString(R.string.restart_the_app_to_use_imported_chat_database) + "\n" + generalGetString(R.string.non_fatal_errors_occured_during_import))
+            }
          }
        } catch (e: Error) {
          operationEnded(m, progressIndicator) {
@@ -892,6 +892,7 @@
  <string name="error_importing_database">Error importing chat database</string>
  <string name="chat_database_imported">Chat database imported</string>
  <string name="restart_the_app_to_use_imported_chat_database">Restart the app to use imported chat database.</string>
+  <string name="non_fatal_errors_occured_during_import">Some non-fatal errors occurred during import - you may see Chat console for more details.</string>
  <string name="delete_chat_profile_question">Delete chat profile?</string>
  <string name="delete_chat_profile_action_cannot_be_undone_warning">This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</string>
  <string name="chat_database_deleted">Chat database deleted</string>