PIN: branch SignOut

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt

@@ -56,6 +56,10 @@ class DefaultLockScreenService @Inject constructor(
             override fun onPinCodeVerified() {
                 _lockScreenState.value = LockScreenLockState.Unlocked
             }
+
+            override fun onPinCodeRemoved() {
+                _lockScreenState.value = LockScreenLockState.Unlocked
+            }
         })
         coroutineScope.lockIfNeeded()
         observeAppForegroundState()

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenFlowNode.kt

@@ -34,10 +34,10 @@ import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SessionScope
 import kotlinx.parcelize.Parcelize
 
-@ContributesNode(AppScope::class)
+@ContributesNode(SessionScope::class)
 class LockScreenFlowNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt

@@ -38,11 +38,11 @@ import io.element.android.features.lockscreen.impl.unlock.PinUnlockNode
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SessionScope
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 
-@ContributesNode(AppScope::class)
+@ContributesNode(SessionScope::class)
 class LockScreenSettingsFlowNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt

@@ -25,9 +25,9 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SessionScope
 
-@ContributesNode(AppScope::class)
+@ContributesNode(SessionScope::class)
 class LockScreenSettingsNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/SetupPinNode.kt

@@ -24,9 +24,9 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SessionScope
 
-@ContributesNode(AppScope::class)
+@ContributesNode(SessionScope::class)
 class SetupPinNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockEvents.kt

@@ -22,4 +22,6 @@ sealed interface PinUnlockEvents {
     data class OnPinKeypadPressed(val pinKeypadModel: PinKeypadModel) : PinUnlockEvents
     data object OnForgetPin : PinUnlockEvents
     data object ClearSignOutPrompt : PinUnlockEvents
+    data object SignOut : PinUnlockEvents
+    data object OnUseBiometric : PinUnlockEvents
 }

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt

@@ -24,9 +24,9 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SessionScope
 
-@ContributesNode(AppScope::class)
+@ContributesNode(SessionScope::class)
 class PinUnlockNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt

@@ -18,6 +18,7 @@ package io.element.android.features.lockscreen.impl.unlock
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -29,10 +30,16 @@ import io.element.android.features.lockscreen.impl.pin.model.PinEntry
 import io.element.android.features.lockscreen.impl.unlock.keypad.PinKeypadModel
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.runCatchingUpdatingState
+import io.element.android.libraries.matrix.api.MatrixClient
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class PinUnlockPresenter @Inject constructor(
     private val pinCodeManager: PinCodeManager,
+    private val matrixClient: MatrixClient,
+    private val coroutineScope: CoroutineScope,
 ) : Presenter<PinUnlockState> {
 
     @Composable
@@ -51,6 +58,10 @@ class PinUnlockPresenter @Inject constructor(
             mutableStateOf(false)
         }
 
+        val signOutAction = remember {
+            mutableStateOf<Async<String?>>(Async.Uninitialized)
+        }
+
         LaunchedEffect(pinEntry) {
             if (pinEntry.isComplete()) {
                 val isVerified = pinCodeManager.verifyPinCode(pinEntry.toText())
@@ -73,6 +84,13 @@ class PinUnlockPresenter @Inject constructor(
                 }
                 PinUnlockEvents.OnForgetPin -> showSignOutPrompt = true
                 PinUnlockEvents.ClearSignOutPrompt -> showSignOutPrompt = false
+                PinUnlockEvents.SignOut -> {
+                    showSignOutPrompt = false
+                    coroutineScope.signOut(signOutAction)
+                }
+                PinUnlockEvents.OnUseBiometric -> {
+                    //TODO
+                }
             }
         }
         return PinUnlockState(
@@ -80,10 +98,17 @@ class PinUnlockPresenter @Inject constructor(
             showWrongPinTitle = showWrongPinTitle,
             remainingAttempts = remainingAttempts,
             showSignOutPrompt = showSignOutPrompt,
+            signOutAction = signOutAction.value,
             eventSink = ::handleEvents
         )
     }
 
+    private fun CoroutineScope.signOut(signOutAction: MutableState<Async<String?>>) = launch {
+        suspend {
+            matrixClient.logout()
+        }.runCatchingUpdatingState(signOutAction)
+    }
+
     private fun PinEntry.process(pinKeypadModel: PinKeypadModel): PinEntry {
         return when (pinKeypadModel) {
             PinKeypadModel.Back -> deleteLast()

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockState.kt

@@ -24,6 +24,7 @@ data class PinUnlockState(
     val showWrongPinTitle: Boolean,
     val remainingAttempts: Async<Int>,
     val showSignOutPrompt: Boolean,
+    val signOutAction: Async<String?>,
     val eventSink: (PinUnlockEvents) -> Unit
 ) {
     val isSignOutPromptCancellable = (remainingAttempts.dataOrNull() ?: 0) > 0

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateProvider.kt

@@ -28,6 +28,7 @@ open class PinUnlockStateProvider : PreviewParameterProvider<PinUnlockState> {
             aPinUnlockState(showWrongPinTitle = true),
             aPinUnlockState(showSignOutPrompt = true),
             aPinUnlockState(showSignOutPrompt = true, remainingAttempts = 0),
+            aPinUnlockState(signOutAction = Async.Loading()),
         )
 }
 
@@ -36,10 +37,12 @@ fun aPinUnlockState(
     remainingAttempts: Int = 3,
     showWrongPinTitle: Boolean = false,
     showSignOutPrompt: Boolean = false,
+    signOutAction: Async<String?> = Async.Uninitialized,
 ) = PinUnlockState(
     pinEntry = pinEntry,
     showWrongPinTitle = showWrongPinTitle,
     remainingAttempts = Async.Success(remainingAttempts),
     showSignOutPrompt = showSignOutPrompt,
+    signOutAction = signOutAction,
     eventSink = {}
 )

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt

@@ -48,6 +48,8 @@ import io.element.android.features.lockscreen.impl.R
 import io.element.android.features.lockscreen.impl.pin.model.PinDigit
 import io.element.android.features.lockscreen.impl.pin.model.PinEntry
 import io.element.android.features.lockscreen.impl.unlock.keypad.PinKeypad
+import io.element.android.libraries.architecture.Async
+import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -79,7 +81,13 @@ fun PinUnlockView(
             }
             val footer = @Composable {
                 PinUnlockFooter(
-                    modifier = Modifier.padding(top = 24.dp)
+                    modifier = Modifier.padding(top = 24.dp),
+                    onUseBiometric = {
+                        state.eventSink(PinUnlockEvents.OnUseBiometric)
+                    },
+                    onForgotPin = {
+                        state.eventSink(PinUnlockEvents.OnForgetPin)
+                    },
                 )
             }
             val content = @Composable { constraints: BoxWithConstraintsScope ->
@@ -107,23 +115,42 @@ fun PinUnlockView(
                     modifier = commonModifier,
                 )
             }
-            if (state.showSignOutPrompt) {
-                if (state.isSignOutPromptCancellable) {
-                    ConfirmationDialog(
-                        title = stringResource(id = R.string.screen_app_lock_signout_alert_title),
-                        content = stringResource(id = R.string.screen_app_lock_signout_alert_message),
-                        onSubmitClicked = {},
-                        onDismiss = {},
-                    )
-                } else {
-                    ErrorDialog(
-                        title = stringResource(id = R.string.screen_app_lock_signout_alert_title),
-                        content = stringResource(id = R.string.screen_app_lock_signout_alert_message),
-                        onDismiss = {},
-                    )
-                }
-            }
         }
+        if (state.showSignOutPrompt) {
+            SignOutPrompt(
+                isCancellable = state.isSignOutPromptCancellable,
+                onSignOut = { state.eventSink(PinUnlockEvents.SignOut) },
+                onDismiss = { state.eventSink(PinUnlockEvents.ClearSignOutPrompt) },
+            )
+        }
+        if (state.signOutAction is Async.Loading) {
+            ProgressDialog(text = stringResource(id = R.string.screen_signout_in_progress_dialog_content))
+        }
+    }
+}
+
+@Composable
+private fun SignOutPrompt(
+    isCancellable: Boolean,
+    onSignOut: () -> Unit,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    if (isCancellable) {
+        ConfirmationDialog(
+            title = stringResource(id = R.string.screen_app_lock_signout_alert_title),
+            content = stringResource(id = R.string.screen_app_lock_signout_alert_message),
+            onSubmitClicked = onSignOut,
+            onDismiss = onDismiss,
+            modifier = modifier,
+        )
+    } else {
+        ErrorDialog(
+            title = stringResource(id = R.string.screen_app_lock_signout_alert_title),
+            content = stringResource(id = R.string.screen_app_lock_signout_alert_message),
+            onDismiss = onSignOut,
+            modifier = modifier,
+        )
     }
 }
 
@@ -255,11 +282,13 @@ private fun PinUnlockHeader(
 
 @Composable
 private fun PinUnlockFooter(
+    onUseBiometric: ()->Unit,
+    onForgotPin: ()->Unit,
     modifier: Modifier = Modifier,
 ) {
     Row(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceAround) {
-        TextButton(text = "Use biometric", onClick = { })
+        TextButton(text = "Use biometric", onClick = onUseBiometric)
-        TextButton(text = stringResource(id = R.string.screen_app_lock_forgot_pin), onClick = { })
+        TextButton(text = stringResource(id = R.string.screen_app_lock_forgot_pin), onClick = onForgotPin)
     }
 }
 

features/lockscreen/impl/src/main/res/values/localazy.xml

@@ -4,12 +4,17 @@
     <item quantity="one">"Wrong PIN. You have %1$d more chance"</item>
     <item quantity="other">"Wrong PIN. You have %1$d more chances"</item>
   </plurals>
+  <string name="screen_app_lock_biometric_authentication">"biometric authentication"</string>
+  <string name="screen_app_lock_biometric_unlock">"biometric unlock"</string>
   <string name="screen_app_lock_forgot_pin">"Forgot PIN?"</string>
   <string name="screen_app_lock_settings_change_pin">"Change PIN code"</string>
   <string name="screen_app_lock_settings_enable_biometric_unlock">"Allow biometric unlock"</string>
   <string name="screen_app_lock_settings_remove_pin">"Remove PIN"</string>
   <string name="screen_app_lock_settings_remove_pin_alert_message">"Are you sure you want to remove PIN?"</string>
   <string name="screen_app_lock_settings_remove_pin_alert_title">"Remove PIN?"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_allow_title">"Allow %1$s"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_skip">"I’d rather use PIN"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_subtitle">"Save yourself some time and use %1$s to unlock the app each time"</string>
   <string name="screen_app_lock_setup_choose_pin">"Choose PIN"</string>
   <string name="screen_app_lock_setup_confirm_pin">"Confirm PIN"</string>
   <string name="screen_app_lock_setup_pin_blacklisted_dialog_content">"You cannot choose this as your PIN code for security reasons"</string>
@@ -22,4 +27,5 @@ Choose something memorable. If you forget this PIN, you will be logged out of th
   <string name="screen_app_lock_signout_alert_message">"You’ll need to re-login and create a new PIN to proceed"</string>
   <string name="screen_app_lock_signout_alert_title">"You are being signed out"</string>
   <string name="screen_app_lock_subtitle">"You have 3 attempts to unlock"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Signing out…"</string>
 </resources>

features/logout/api/src/main/res/values/localazy.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_backing_up_subtitle">"Please wait for this to complete before signing out."</string>
-  <string name="screen_signout_backing_up_title">"Your keys are still being backed up"</string>
   <string name="screen_signout_confirmation_dialog_content">"Are you sure you want to sign out?"</string>
   <string name="screen_signout_confirmation_dialog_title">"Sign out"</string>
   <string name="screen_signout_in_progress_dialog_content">"Signing out…"</string>
-  <string name="screen_signout_last_session_subtitle">"You are about to sign out of your last session. If you sign out now, you might lose access to your encrypted messages."</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"You are about to sign out of your last session. If you sign out now, you will lose access to your encrypted messages."</string>
-  <string name="screen_signout_last_session_title">"Recovery not set up"</string>
+  <string name="screen_signout_key_backup_disabled_title">"You have turned off backup"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Your keys were still being backed up when you went offline. Reconnect so that your keys can be backed up before signing out."</string>
+  <string name="screen_signout_key_backup_offline_title">"Your keys are still being backed up"</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Please wait for this to complete before signing out."</string>
+  <string name="screen_signout_key_backup_ongoing_title">"Your keys are still being backed up"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"You are about to sign out of your last session. If you sign out now, you\'ll lose access to your encrypted messages."</string>
+  <string name="screen_signout_recovery_disabled_title">"Recovery not set up"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"You are about to sign out of your last session. If you sign out now, you might lose access to your encrypted messages."</string>
+  <string name="screen_signout_save_recovery_key_title">"Have you saved your recovery key?"</string>
   <string name="screen_signout_confirmation_dialog_submit">"Sign out"</string>
   <string name="screen_signout_preference_item">"Sign out"</string>
 </resources>

features/messages/impl/src/main/res/values/localazy.xml

@@ -12,7 +12,8 @@
   <string name="screen_room_attachment_source_location">"Location"</string>
   <string name="screen_room_attachment_source_poll">"Poll"</string>
   <string name="screen_room_attachment_text_formatting">"Text Formatting"</string>
-  <string name="screen_room_encrypted_history_banner">"Message history is currently unavailable in this room"</string>
+  <string name="screen_room_encrypted_history_banner">"Message history is currently unavailable."</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"Message history is unavailable in this room. Verify this device to see your message history."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Could not retrieve user details"</string>
   <string name="screen_room_invite_again_alert_message">"Would you like to invite them back?"</string>
   <string name="screen_room_invite_again_alert_title">"You are alone in this chat"</string>

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -51,7 +51,7 @@
   <string name="action_no">"No"</string>
   <string name="action_not_now">"Not now"</string>
   <string name="action_ok">"OK"</string>
-  <string name="action_open_settings">"Open settings"</string>
+  <string name="action_open_settings">"Settings"</string>
   <string name="action_open_with">"Open with"</string>
   <string name="action_quick_reply">"Quick reply"</string>
   <string name="action_quote">"Quote"</string>
@@ -145,6 +145,7 @@
   <string name="common_server_url">"Server URL"</string>
   <string name="common_settings">"Settings"</string>
   <string name="common_shared_location">"Shared location"</string>
+  <string name="common_signing_out">"Signing out"</string>
   <string name="common_starting_chat">"Starting chat…"</string>
   <string name="common_sticker">"Sticker"</string>
   <string name="common_success">"Success"</string>
@@ -167,8 +168,11 @@
   <string name="common_video">"Video"</string>
   <string name="common_voice_message">"Voice message"</string>
   <string name="common_waiting">"Waiting…"</string>
+  <string name="common_waiting_for_decryption_key">"Waiting for decryption key"</string>
   <string name="common_poll_end_confirmation">"Are you sure you want to end this poll?"</string>
   <string name="common_poll_summary">"Poll: %1$s"</string>
+  <string name="confirm_recovery_key_banner_message">"Your chat backup is currently out of sync. You need to confirm your recovery key to maintain access to your chat backup."</string>
+  <string name="confirm_recovery_key_banner_title">"Confirm your recovery key"</string>
   <string name="dialog_title_confirmation">"Confirmation"</string>
   <string name="dialog_title_warning">"Warning"</string>
   <string name="emoji_picker_category_activity">"Activities"</string>
@@ -268,6 +272,8 @@ If you proceed, some of your settings may change."</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Enter…"</string>
   <string name="screen_recovery_key_confirm_success">"Recovery key confirmed"</string>
   <string name="screen_recovery_key_confirm_title">"Confirm your recovery key"</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"Copied recovery key"</string>
+  <string name="screen_recovery_key_generating_key">"Generating…"</string>
   <string name="screen_recovery_key_save_action">"Save recovery key"</string>
   <string name="screen_recovery_key_save_description">"Write down your recovery key somewhere safe or save it in a password manager."</string>
   <string name="screen_recovery_key_save_key_description">"Tap to copy recovery key"</string>

tools/localazy/config.json

@@ -158,7 +158,8 @@
     {
       "name": ":features:lockscreen:impl",
       "includeRegex": [
-        "screen_app_lock_.*"
+        "screen_app_lock_.*",
+        "screen_signout_in_progress_dialog_content"
       ]
     }
   ]