From 165ba3dca22f3d1a3eaaa3149ae9f6141cd31640 Mon Sep 17 00:00:00 2001 From: Jakub Zerko Date: Mon, 16 Dec 2024 14:06:42 +0100 Subject: [PATCH 1/2] fix: handle mls disabled error --- .../com/wire/android/ui/debug/DebugDataOptionsViewModel.kt | 3 +++ .../android/ui/settings/devices/DeviceDetailsViewModel.kt | 4 ++-- .../android/ui/settings/devices/DeviceDetailsViewModelTest.kt | 2 +- kalium | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptionsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptionsViewModel.kt index e98c20eb903..27fdf191eb9 100644 --- a/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptionsViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptionsViewModel.kt @@ -304,6 +304,9 @@ class DebugDataOptionsViewModelImpl } is MLSKeyPackageCountResult.Failure.Generic -> {} + MLSKeyPackageCountResult.Failure.NotEnabled -> { + state = state.copy(mlsErrorMessage = "Not Enabled!") + } } } } diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt index f6d06b76b68..599129a823a 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt @@ -72,7 +72,7 @@ class DeviceDetailsViewModel @Inject constructor( private val fingerprintUseCase: ClientFingerprintUseCase, private val updateClientVerificationStatus: UpdateClientVerificationStatusUseCase, private val observeUserInfo: ObserveUserInfoUseCase, - private val e2eiCertificate: GetMLSClientIdentityUseCase, + private val mlsClientIdentity: GetMLSClientIdentityUseCase, private val breakSession: BreakSessionUseCase, isE2EIEnabledUseCase: IsE2EIEnabledUseCase ) : SavedStateViewModel(savedStateHandle) { @@ -133,7 +133,7 @@ class DeviceDetailsViewModel @Inject constructor( private fun getE2eiCertificate() { viewModelScope.launch { - state = e2eiCertificate(deviceId).fold({ + state = mlsClientIdentity(deviceId).fold({ state.copy(isE2eiCertificateActivated = false, isLoadingCertificate = false) }, { mlsClientIdentity -> state.copy( diff --git a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt index 6b69dabbd6e..5e0ea113b3a 100644 --- a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt +++ b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt @@ -377,7 +377,7 @@ class DeviceDetailsViewModelTest { updateClientVerificationStatus = updateClientVerificationStatus, currentUserId = currentUserId, observeUserInfo = observeUserInfo, - e2eiCertificate = getE2eiCertificate, + mlsClientIdentity = getE2eiCertificate, isE2EIEnabledUseCase = isE2EIEnabledUseCase, breakSession = breakSession ) diff --git a/kalium b/kalium index c9f091b3923..f0f141519e1 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit c9f091b392378afa02a1ca0df92d41052b0439a1 +Subproject commit f0f141519e19045461129046be9487a5e2e4b4bd From 4be0878fc214c2dfb4b7877c8308a29187121641 Mon Sep 17 00:00:00 2001 From: Jakub Zerko Date: Mon, 16 Dec 2024 16:23:34 +0100 Subject: [PATCH 2/2] kalium update --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index f0f141519e1..da1e7ebe24d 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit f0f141519e19045461129046be9487a5e2e4b4bd +Subproject commit da1e7ebe24dc6db2081071e28169154b31f99096