chore: manual cherry pick of #3658

wireapp · Nov 27, 2024 · 06ef118 · 06ef118
1 parent 48ed55e
commit 06ef118
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/feature/AccountSwitchUseCase.kt b/app/src/main/kotlin/com/wire/android/feature/AccountSwitchUseCase.kt
@@ -167,6 +167,7 @@ class AccountSwitchUseCase @Inject constructor(
             LogoutReason.SELF_SOFT_LOGOUT, LogoutReason.SELF_HARD_LOGOUT -> {
                 deleteSession(invalidAccount.userId)
             }
+            LogoutReason.MIGRATION_TO_CC_FAILED,
             LogoutReason.DELETED_ACCOUNT,
             LogoutReason.REMOVED_CLIENT,
             LogoutReason.SESSION_EXPIRED -> deleteSession(invalidAccount.userId)

diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
@@ -292,7 +292,7 @@ class WireActivityViewModel @Inject constructor(
                     // Self logout is handled from the Self user profile screen directly
                 }
 
-                LogoutReason.REMOVED_CLIENT ->
+                LogoutReason.MIGRATION_TO_CC_FAILED, LogoutReason.REMOVED_CLIENT ->
                     globalAppState =
                         globalAppState.copy(blockUserUI = CurrentSessionErrorState.RemovedClient)
 

diff --git a/default.json b/default.json
@@ -28,7 +28,7 @@
             "default_backend_url_blacklist": "https://clientblacklist.wire.com/staging",
             "default_backend_url_website": "https://wire.com",
             "default_backend_title": "wire-staging",
-            "encrypt_proteus_storage": true,
+            "encrypt_proteus_storage": false,
             "analytics_enabled": false,
             "picture_in_picture_enabled": true,
             "analytics_app_key": "8ffae535f1836ed5f58fd5c8a11c00eca07c5438",

diff --git a/kalium b/kalium
+28 −19		cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/ProteusClientCoreCryptoImpl.kt
+4 −1		cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/exceptions/ProteusException.kt
+7 −1		data/src/commonMain/kotlin/com/wire/kalium/logic/data/logout/LogoutReason.kt
+1 −1		data/src/commonMain/kotlin/com/wire/kalium/logic/data/user/CreateUserTeam.kt
+34 −10		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusClientProvider.kt
+30 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusMigrationRecoveryHandler.kt
+2 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/session/SessionMapper.kt
+6 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/user/UserRepository.kt
+19 −7		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+12 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCase.kt
+52 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerImpl.kt
+8 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt
+9 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/user/migration/MigrateFromPersonalToTeamUseCase.kt
+1 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncCriteriaProvider.kt
+33 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt
+31 −10		.../src/commonTest/kotlin/com/wire/kalium/logic/feature/user/migration/MigrateFromPersonalToTeamUseCaseTest.kt
+73 −0		logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt
+36 −0		logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt
+3 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/Users.sq
+1 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/UserDAO.kt
+4 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/UserDAOImpl.kt
+6 −1		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/model/LogoutReason.kt