Merge branch 'develop' into Push-notification-on-top-of-calling-UI-shown

wireapp · Nov 7, 2024 · 8532cea · 8532cea
2 parents fef26d1 + e3c1dee
commit 8532cea
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
+3 −0		calling/consumer-proguard-rules.pro
+29 −16		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepository.kt
+1 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+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
+3 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ConversationScope.kt
+41 −0		...in/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationListDetailsWithEventsUseCaseImpl.kt
+2 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapperTest.kt
+84 −92		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepositoryTest.kt
+147 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/ConversationDetails.sq
+174 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/ConversationDetailsWithEvents.sq
+3 −253		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq
+9 −37		persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessagePreview.sq
+215 −0		persistence/src/commonMain/db_user/migrations/88.sqm
+2 −2		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAO.kt
+13 −9		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAOImpl.kt
+14 −22		...e/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDetailsWithEventsMapper.kt
+39 −13		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationExtensions.kt
+2 −2		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationMapper.kt
+1 −1		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/member/MemberDAO.kt
+2 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt
+2 −2		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/conversation/ConversationExtensionsTest.kt
+5 −5		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt