fix(e2ei): error handling (WPB-6271) (#2721)

wireapp · Feb 23, 2024 · b63999c · b63999c
1 parent 1bd32ad
commit b63999c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 30 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/feature/e2ei/GetE2EICertificateUseCase.kt b/app/src/main/kotlin/com/wire/android/feature/e2ei/GetE2EICertificateUseCase.kt
@@ -20,13 +20,13 @@ package com.wire.android.feature.e2ei
 import android.content.Context
 import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.android.util.extension.getActivity
-import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.E2EIFailure
 import com.wire.kalium.logic.feature.e2ei.usecase.E2EIEnrollmentResult
 import com.wire.kalium.logic.feature.e2ei.usecase.EnrollE2EIUseCase
 import com.wire.kalium.logic.functional.Either
 import com.wire.kalium.logic.functional.fold
 import dagger.hilt.android.qualifiers.ApplicationContext
+import com.wire.kalium.logic.functional.left
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
@@ -44,20 +44,18 @@ class GetE2EICertificateUseCase @Inject constructor(
 
     operator fun invoke(
         isNewClient: Boolean,
-        enrollmentResultHandler: (Either<CoreFailure, E2EIEnrollmentResult>) -> Unit
+        enrollmentResultHandler: (Either<E2EIFailure, E2EIEnrollmentResult>) -> Unit
     ) {
         this.enrollmentResultHandler = enrollmentResultHandler
         scope.launch {
             enrollE2EI.initialEnrollment(isNewClientRegistration = isNewClient).fold({
                 enrollmentResultHandler(Either.Left(it))
             }, {
-                if (it is E2EIEnrollmentResult.Initialized) {
-                    initialEnrollmentResult = it
-                    OAuthUseCase(applicationContext, it.target, it.oAuthClaims, it.oAuthState).launch(
-                        applicationContext.getActivity()!!.activityResultRegistry,
-                        ::oAuthResultHandler
-                    )
-                } else enrollmentResultHandler(Either.Right(it))
+                initialEnrollmentResult = it
+                OAuthUseCase(applicationContext, it.target, it.oAuthClaims, it.oAuthState).launch(
+                    applicationContext.getActivity()!!.activityResultRegistry,
+                    ::oAuthResultHandler
+                )
             })
         }
     }
@@ -76,7 +74,7 @@ class GetE2EICertificateUseCase @Inject constructor(
                 }
 
                 is OAuthUseCase.OAuthResult.Failed -> {
-                    enrollmentResultHandler(Either.Left(E2EIFailure.FailedOAuth(oAuthResult.reason)))
+                    enrollmentResultHandler(E2EIFailure.OAuth(oAuthResult.reason).left())
                 }
             }
         }

diff --git a/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptions.kt b/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptions.kt
@@ -55,7 +55,6 @@ import com.wire.android.ui.theme.wireTypography
 import com.wire.android.util.getDeviceIdString
 import com.wire.android.util.getGitBuildId
 import com.wire.android.util.ui.PreviewMultipleThemes
-import com.wire.kalium.logic.E2EIFailure
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.feature.debug.DisableEventProcessingUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.E2EIEnrollmentResult
@@ -130,13 +129,17 @@ class DebugDataOptionsViewModel
         e2eiCertificateUseCase(false) { result ->
             result.fold({
                 state = state.copy(
-                    certificate = (it as E2EIFailure.FailedOAuth).reason, showCertificate = true
+                    certificate = it.toString(), showCertificate = true
                 )
             }, {
-                if (it is E2EIEnrollmentResult.Finalized) {
-                    state = state.copy(
+                state = if (it is E2EIEnrollmentResult.Finalized) {
+                    state.copy(
                         certificate = it.certificate, showCertificate = true
                     )
+                } else {
+                    state.copy(
+                        certificate = it.toString(), showCertificate = true
+                    )
                 }
             })
         }

diff --git a/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/E2EIEnrollmentViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/E2EIEnrollmentViewModel.kt
@@ -109,6 +109,11 @@ class E2EIEnrollmentViewModel @Inject constructor(
                         isCertificateEnrollError = false,
                         isLoading = false
                     )
+                } else {
+                    state = state.copy(
+                        isLoading = false,
+                        isCertificateEnrollError = true
+                    )
                 }
             })
         }

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/sync/FeatureFlagNotificationViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/sync/FeatureFlagNotificationViewModel.kt
@@ -306,21 +306,21 @@ class FeatureFlagNotificationViewModel @Inject constructor(
                             e2EIResult = FeatureFlagState.E2EIResult.Failure(e2eiRequired)
                         )
                     }, {
-                        if (it is E2EIEnrollmentResult.Finalized) {
-                            featureFlagState = featureFlagState.copy(
-                                isE2EILoading = false,
-                                e2EIRequired = null,
-                                e2EIResult = FeatureFlagState.E2EIResult.Success(it.certificate)
-                            )
-                        } else if (it is E2EIEnrollmentResult.Failed) {
-                            featureFlagState = featureFlagState.copy(
-                                isE2EILoading = false,
-                                e2EIRequired = null,
-                                e2EIResult = FeatureFlagState.E2EIResult.Failure(e2eiRequired)
-                            )
-                        }
-                    })
-                }
+                        featureFlagState = if (it is E2EIEnrollmentResult.Finalized) {
+                        featureFlagState.copy(
+                            isE2EILoading = false,
+                            e2EIRequired = null,
+                            e2EIResult = FeatureFlagState.E2EIResult.Success(it.certificate)
+                        )
+                    } else {
+                        featureFlagState.copy(
+                            isE2EILoading = false,
+                            e2EIRequired = null,
+                            e2EIResult = FeatureFlagState.E2EIResult.Failure(e2eiRequired)
+                        )
+                    }
+                })
+            }
         }
     }
 

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
@@ -139,7 +139,7 @@ class DeviceDetailsViewModel @Inject constructor(
                 if (it is E2EIEnrollmentResult.Finalized) {
                     getE2eiCertificate()
                     state = state.copy(isE2EICertificateEnrollSuccess = true)
-                } else if (it is E2EIEnrollmentResult.Failed) {
+                } else {
                     state = state.copy(
                         isLoadingCertificate = false,
                         isE2EICertificateEnrollError = true