Merge "Don't invoke resultreceiver for the empty auth entry snackbar." (188f25f3) · Commits · e / os / android_frameworks_base

packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt

+10 −1

Original line number	Diff line number	Diff line
		@@ -55,11 +55,20 @@ class CredentialSelectorViewModel(
		/**************************************************************************/
		/*** Shared Callbacks ***/
		/**************************************************************************/
		fun onCancel() {
		fun onUserCancel() {
		Log.d(Constants.LOG_TAG, "User cancelled, finishing the ui")
		credManRepo.onUserCancel()
		uiState = uiState.copy(dialogState = DialogState.COMPLETE)
		}

		/** Close the activity and don't report anything to the backend.
		* Example use case is the no-auth-info snackbar where the activity should simply display the
		* UI and then be dismissed. */
		fun silentlyFinishActivity() {
		Log.d(Constants.LOG_TAG, "Silently finishing the ui")
		uiState = uiState.copy(dialogState = DialogState.COMPLETE)
		}

		fun onNewCredentialManagerRepo(credManRepo: CredentialManagerRepo) {
		this.credManRepo = credManRepo
		uiState = credManRepo.initState()

packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialComponents.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ fun CreateCredentialScreen(
		}
		}
		},
		onDismiss = viewModel::onCancel
		onDismiss = viewModel::onUserCancel
		)
		}

packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt

+7 −7

Original line number	Diff line number	Diff line
		@@ -82,15 +82,15 @@ fun GetCredentialScreen(
		if (getCredentialUiState.currentScreenState == GetScreenState.REMOTE_ONLY) {
		RemoteCredentialSnackBarScreen(
		onClick = viewModel::getFlowOnMoreOptionOnSnackBarSelected,
		onCancel = viewModel::onCancel,
		onCancel = viewModel::onUserCancel,
		)
		} else if (getCredentialUiState.currentScreenState
		== GetScreenState.UNLOCKED_AUTH_ENTRIES_ONLY) {
		EmptyAuthEntrySnackBarScreen(
		authenticationEntryList =
		getCredentialUiState.providerDisplayInfo.authenticationEntryList,
		onCancel = viewModel::onCancel,
		onLastLokcedAuthEntryNotFound = viewModel::onLastLockedAuthEntryNotFoundError,
		onCancel = viewModel::silentlyFinishActivity,
		onLastLockedAuthEntryNotFound = viewModel::onLastLockedAuthEntryNotFoundError,
		)
		} else {
		ModalBottomSheet(
		@@ -118,7 +118,7 @@ fun GetCredentialScreen(
		onEntrySelected = viewModel::getFlowOnEntrySelected,
		onBackButtonClicked =
		viewModel::getFlowOnBackToPrimarySelectionScreen,
		onCancel = viewModel::onCancel,
		onCancel = viewModel::onUserCancel,
		isNoAccount = getCredentialUiState.isNoAccount,
		)
		}
		@@ -135,7 +135,7 @@ fun GetCredentialScreen(
		}
		}
		},
		onDismiss = viewModel::onCancel,
		onDismiss = viewModel::onUserCancel,
		)
		}
		}
		@@ -668,11 +668,11 @@ fun RemoteCredentialSnackBarScreen(
		fun EmptyAuthEntrySnackBarScreen(
		authenticationEntryList: List<AuthenticationEntryInfo>,
		onCancel: () -> Unit,
		onLastLokcedAuthEntryNotFound: () -> Unit,
		onLastLockedAuthEntryNotFound: () -> Unit,
		) {
		val lastLocked = authenticationEntryList.firstOrNull({it.isLastUnlocked})
		if (lastLocked == null) {
		onLastLokcedAuthEntryNotFound()
		onLastLockedAuthEntryNotFound()
		return
		}