Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bulletproofing crypto box to cc migration (WPB-14250) #3658

Merged
merged 5 commits into from
Nov 27, 2024
Merged

chore: bulletproofing crypto box to cc migration (WPB-14250) #3658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87b89b1
feat: cleaning all data if failure
yamilmedina Nov 19, 2024
4b34eb8
feat: clean up code
yamilmedina Nov 20, 2024
03fb080
chore: kalium ref with new changes
yamilmedina Nov 22, 2024
c20d58d
feat: kalium ref update
yamilmedina Nov 26, 2024
6905f1c
feat: kalium ref update
yamilmedina Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/kotlin/com/wire/android/feature/AccountSwitchUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for dev this should be fine since it is not used as a daily driver by anyone

"analytics_enabled": false,
"picture_in_picture_enabled": true,
"analytics_app_key": "8ffae535f1836ed5f58fd5c8a11c00eca07c5438",
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 15 files
+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
+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
+14 −6 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
+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
+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
+6 −1 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/model/LogoutReason.kt
Loading