From 87b89b135b023e64928c17bfc4b8677fb0194419 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Tue, 19 Nov 2024 18:41:20 +0100 Subject: [PATCH 1/5] feat: cleaning all data if failure --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 7440f44a015..7abf566f3e1 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 7440f44a0153dd4527e88991610db0260fab4762 +Subproject commit 7abf566f3e173d24071696bbdb36b098378d06ca From 4b34eb82e05f44396f86db745b1f9bda4c502ef7 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Wed, 20 Nov 2024 18:17:00 +0100 Subject: [PATCH 2/5] feat: clean up code --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 7abf566f3e1..8f12b41155e 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 7abf566f3e173d24071696bbdb36b098378d06ca +Subproject commit 8f12b41155ed227d4de49bf0b8a8afb957f87cb4 From 03fb080dcfbae12019dc8bb39fc6e7c53366d562 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Fri, 22 Nov 2024 15:45:52 +0100 Subject: [PATCH 3/5] chore: kalium ref with new changes --- .../kotlin/com/wire/android/feature/AccountSwitchUseCase.kt | 1 + .../main/kotlin/com/wire/android/ui/WireActivityViewModel.kt | 2 +- default.json | 2 +- kalium | 2 +- 4 files changed, 4 insertions(+), 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 index 921e20b233c..4d59a2861b2 100644 --- 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 index 4fefdb9e261..624b6aa74a5 100644 --- 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 index a2ba34da13d..a1d40d3e898 100644 --- a/default.json +++ b/default.json @@ -29,7 +29,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 index 8f12b41155e..96e0c5d5a6f 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 8f12b41155ed227d4de49bf0b8a8afb957f87cb4 +Subproject commit 96e0c5d5a6f972b161cf3dec59e253ecaebe0c82 From c20d58d8aca4cc4b852b4263dfe7896e04d66360 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Tue, 26 Nov 2024 10:35:36 +0100 Subject: [PATCH 4/5] feat: kalium ref update --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 96e0c5d5a6f..20b3892dc95 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 96e0c5d5a6f972b161cf3dec59e253ecaebe0c82 +Subproject commit 20b3892dc95dc3ef542376d7c02701ab7c53d897 From 6905f1c22c5123d7749b883618593dd24770b110 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Tue, 26 Nov 2024 17:10:31 +0100 Subject: [PATCH 5/5] feat: kalium ref update --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 20b3892dc95..5b2361e4f96 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 20b3892dc95dc3ef542376d7c02701ab7c53d897 +Subproject commit 5b2361e4f96ef7f51410ff97fe6e1a907e84d455