chore: improve logging for backups (WPB-12113) (#3595)

wireapp · Nov 7, 2024 · 55863ae · 55863ae
1 parent ed80ab9
commit 55863ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreViewModel.kt
@@ -212,7 +212,7 @@ class BackupAndRestoreViewModel
             restoreFileValidation = RestoreFileValidation.ValidNonEncryptedBackup,
             backupRestoreProgress = BackupRestoreProgress.InProgress(PROGRESS_75)
         )
-        when (importBackup(importedBackupPath, null)) {
+        when (val result = importBackup(importedBackupPath, null)) {
             RestoreBackupResult.Success -> {
                 updateCreationProgress(PROGRESS_75)
                 delay(SMALL_DELAY)
@@ -221,10 +221,7 @@ class BackupAndRestoreViewModel
             }
 
             is RestoreBackupResult.Failure -> {
-                appLogger.e(
-                    "Error when restoring the db file. The format or version of the backup is not compatible with this " +
-                            "version of the app"
-                )
+                appLogger.e("Error when restoring the backup db file caused by: ${result.failure.cause}")
                 state = state.copy(
                     restoreFileValidation = RestoreFileValidation.IncompatibleBackup,
                     backupRestoreProgress = BackupRestoreProgress.Failed

diff --git a/kalium b/kalium
+9 −3		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/backup/RestoreBackupUseCase.kt
+7 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/backup/RestoreWebBackupUseCase.kt
+99 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/SyncManagerLogger.kt
+19 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/incremental/IncrementalSyncManager.kt
+5 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncManager.kt
+5 −5		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepositoryTest.kt