From 39da7e75a58c6d36bbef86a7aff588a4d73b1a6e Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 7 Nov 2023 21:08:02 +0100 Subject: [PATCH] Lock screen : fix code quality --- .../impl/settings/LockScreenSettingsFlowNode.kt | 2 -- .../lockscreen/impl/unlock/PinUnlockPresenter.kt | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt index ac87529e93..dec3699d07 100644 --- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt +++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt @@ -32,7 +32,6 @@ import com.bumble.appyx.navmodel.backstack.operation.push import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode -import io.element.android.features.lockscreen.impl.biometric.BiometricUnlockManager import io.element.android.features.lockscreen.impl.pin.DefaultPinCodeManagerCallback import io.element.android.features.lockscreen.impl.pin.PinCodeManager import io.element.android.features.lockscreen.impl.setup.pin.SetupPinNode @@ -50,7 +49,6 @@ class LockScreenSettingsFlowNode @AssistedInject constructor( @Assisted buildContext: BuildContext, @Assisted plugins: List, private val pinCodeManager: PinCodeManager, - private val biometricUnlockManager: BiometricUnlockManager, ) : BackstackNode( backstack = BackStack( initialElement = NavTarget.Unknown, diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt index 21f08a3829..b2d1135963 100644 --- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt +++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt @@ -39,7 +39,6 @@ import io.element.android.libraries.core.bool.orFalse import io.element.android.libraries.matrix.api.MatrixClient import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import timber.log.Timber import javax.inject.Inject class PinUnlockPresenter @Inject constructor( @@ -99,7 +98,11 @@ class PinUnlockPresenter @Inject constructor( showSignOutPrompt = true } } - IsUnlockedEffect(isUnlocked) + + OnUnlockEffect { + isUnlocked.value = true + } + fun handleEvents(event: PinUnlockEvents) { when (event) { is PinUnlockEvents.OnPinKeypadPressed -> { @@ -140,16 +143,16 @@ class PinUnlockPresenter @Inject constructor( } @Composable - private fun IsUnlockedEffect(isUnlocked: MutableState) { + private fun OnUnlockEffect(onUnlock: () -> Unit) { DisposableEffect(Unit) { val biometricUnlockCallback = object : DefaultBiometricUnlockCallback() { override fun onBiometricUnlockSuccess() { - isUnlocked.value = true + onUnlock() } } val pinCodeVerifiedCallback = object : DefaultPinCodeManagerCallback() { override fun onPinCodeVerified() { - isUnlocked.value = true + onUnlock() } } biometricUnlockManager.addCallback(biometricUnlockCallback)