Merge "[flexiglass] Reset PIN and Password on the bouncer when it's re-shown." into main (f1f3666c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModel.kt

+5 −4

Original line number	Diff line number	Diff line
		@@ -40,20 +40,21 @@ class PasswordBouncerViewModel(

		/** Notifies that the UI has been shown to the user. */
		fun onShown() {
		_password.value = ""
		interactor.resetMessage()
		}

		/** Notifies that the user has changed the password input. */
		fun onPasswordInputChanged(password: String) {
		if (this.password.value.isEmpty() && password.isNotEmpty()) {
		fun onPasswordInputChanged(newPassword: String) {
		if (this.password.value.isEmpty() && newPassword.isNotEmpty()) {
		interactor.clearMessage()
		}

		if (password.isNotEmpty()) {
		if (newPassword.isNotEmpty()) {
		interactor.onIntentionalUserInput()
		}

		_password.value = password
		_password.value = newPassword
		}

		/** Notifies that the user has pressed the key for attempting to authenticate the password. */

packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModel.kt

+8 −9

Original line number	Diff line number	Diff line
		@@ -70,13 +70,7 @@ class PinBouncerViewModel(
		/** Appearance of the confirm button. */
		val confirmButtonAppearance: StateFlow<ActionButtonAppearance> =
		interactor.isAutoConfirmEnabled
		.map {
		if (it) {
		ActionButtonAppearance.Hidden
		} else {
		ActionButtonAppearance.Shown
		}
		}
		.map { if (it) ActionButtonAppearance.Hidden else ActionButtonAppearance.Shown }
		.stateIn(
		scope = applicationScope,
		started = SharingStarted.Eagerly,
		@@ -85,6 +79,7 @@ class PinBouncerViewModel(

		/** Notifies that the UI has been shown to the user. */
		fun onShown() {
		clearPinInput()
		interactor.resetMessage()
		}

		@@ -113,7 +108,7 @@ class PinBouncerViewModel(

		/** Notifies that the user long-pressed the backspace button. */
		fun onBackspaceButtonLongPressed() {
		mutablePinInput.value = mutablePinInput.value.clearAll()
		clearPinInput()
		}

		/** Notifies that the user clicked the "enter" button. */
		@@ -121,6 +116,10 @@ class PinBouncerViewModel(
		tryAuthenticate(useAutoConfirm = false)
		}

		private fun clearPinInput() {
		mutablePinInput.value = mutablePinInput.value.clearAll()
		}

		private fun tryAuthenticate(useAutoConfirm: Boolean) {
		val pinCode = mutablePinInput.value.getPin()

		@@ -133,7 +132,7 @@ class PinBouncerViewModel(

		// TODO(b/291528545): this should not be cleared on success (at least until the view
		// is animated away).
		mutablePinInput.value = mutablePinInput.value.clearAll()
		clearPinInput()
		}
		}

packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/PasswordBouncerViewModelTest.kt

+35 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,41 @@ class PasswordBouncerViewModelTest : SysuiTestCase() {
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Gone))
		}

		@Test
		fun onShown_againAfterSceneChange_resetsPassword() =
		testScope.runTest {
		val currentScene by collectLastValue(sceneInteractor.desiredScene)
		val password by collectLastValue(underTest.password)
		utils.authenticationRepository.setAuthenticationMethod(
		AuthenticationMethodModel.Password
		)
		utils.authenticationRepository.setUnlocked(false)
		sceneInteractor.changeScene(SceneModel(SceneKey.Bouncer), "reason")
		sceneInteractor.onSceneChanged(SceneModel(SceneKey.Bouncer), "reason")
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer))
		underTest.onShown()

		// The user types a password.
		underTest.onPasswordInputChanged("password")
		assertThat(password).isEqualTo("password")

		// The user doesn't confirm the password, but navigates back to the lockscreen instead.
		sceneInteractor.changeScene(SceneModel(SceneKey.Lockscreen), "reason")
		sceneInteractor.onSceneChanged(SceneModel(SceneKey.Lockscreen), "reason")
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen))

		// The user navigates to the bouncer again.
		sceneInteractor.changeScene(SceneModel(SceneKey.Bouncer), "reason")
		sceneInteractor.onSceneChanged(SceneModel(SceneKey.Bouncer), "reason")
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer))

		underTest.onShown()

		// Ensure the previously-entered password is not shown.
		assertThat(password).isEmpty()
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer))
		}

		companion object {
		private const val ENTER_YOUR_PASSWORD = "Enter your password"
		private const val WRONG_PASSWORD = "Wrong password"

packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/viewmodel/PinBouncerViewModelTest.kt

+36 −0

Original line number	Diff line number	Diff line
		@@ -313,6 +313,42 @@ class PinBouncerViewModelTest : SysuiTestCase() {
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer))
		}

		@Test
		fun onShown_againAfterSceneChange_resetsPin() =
		testScope.runTest {
		val currentScene by collectLastValue(sceneInteractor.desiredScene)
		val pin by collectLastValue(underTest.pinInput.map { it.getPin() })
		utils.authenticationRepository.setAuthenticationMethod(AuthenticationMethodModel.Pin)
		utils.authenticationRepository.setUnlocked(false)
		sceneInteractor.changeScene(SceneModel(SceneKey.Bouncer), "reason")
		sceneInteractor.onSceneChanged(SceneModel(SceneKey.Bouncer), "reason")

		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer))
		underTest.onShown()

		// The user types a PIN.
		FakeAuthenticationRepository.DEFAULT_PIN.forEach { digit ->
		underTest.onPinButtonClicked(digit)
		}
		assertThat(pin).isNotEmpty()

		// The user doesn't confirm the PIN, but navigates back to the lockscreen instead.
		sceneInteractor.changeScene(SceneModel(SceneKey.Lockscreen), "reason")
		sceneInteractor.onSceneChanged(SceneModel(SceneKey.Lockscreen), "reason")
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Lockscreen))

		// The user navigates to the bouncer again.
		sceneInteractor.changeScene(SceneModel(SceneKey.Bouncer), "reason")
		sceneInteractor.onSceneChanged(SceneModel(SceneKey.Bouncer), "reason")
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer))

		underTest.onShown()

		// Ensure the previously-entered PIN is not shown.
		assertThat(pin).isEmpty()
		assertThat(currentScene).isEqualTo(SceneModel(SceneKey.Bouncer))
		}

		@Test
		fun backspaceButtonAppearance_withoutAutoConfirm_alwaysShown() =
		testScope.runTest {