Merge "Revise the save-flow" into udc-dev am: 91c9f5b7d1 (69093fc8) · Commits · e / os / android_frameworks_base

packages/CredentialManager/AndroidManifest.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -42,15 +42,6 @@
		android:excludeFromRecents="true"
		android:theme="@style/Theme.CredentialSelector">
		</activity>

		<receiver
		android:name=".CredentialProviderReceiver"
		android:exported="true"
		android:permission="android.permission.LAUNCH_CREDENTIAL_SELECTOR">
		<intent-filter>
		<action android:name="android.credentials.ui.action.CREDMAN_ENABLED_PROVIDERS_UPDATED"/>
		</intent-filter>
		</receiver>
		</application>

		</manifest>

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ class CredentialManagerRepo(

		initialUiState = when (requestInfo?.type) {
		RequestInfo.TYPE_CREATE -> {
		val defaultProviderIdSetByUser = userConfigRepo.getDefaultProviderId()
		val isPasskeyFirstUse = userConfigRepo.getIsPasskeyFirstUse()
		val providerEnableListUiState = getCreateProviderEnableListInitialUiState()
		val providerDisableListUiState = getCreateProviderDisableListInitialUiState()
		@@ -119,7 +118,8 @@ class CredentialManagerRepo(
		disabledProviders = providerDisableListUiState,
		defaultProviderIdPreferredByApp =
		requestDisplayInfoUiState.appPreferredDefaultProviderId,
		defaultProviderIdSetByUser = defaultProviderIdSetByUser,
		defaultProviderIdsSetByUser =
		requestDisplayInfoUiState.userSetDefaultProviderIds,
		requestDisplayInfo = requestDisplayInfoUiState,
		isOnPasskeyIntroStateAlready = false,
		isPasskeyFirstUse = isPasskeyFirstUse,

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

deleted100644 → 0

+0 −35

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.credentialmanager

		import android.content.BroadcastReceiver
		import android.content.Context
		import android.content.Intent
		import android.util.Log
		import com.android.credentialmanager.common.Constants


		class CredentialProviderReceiver : BroadcastReceiver() {

		override fun onReceive(context: Context?, intent: Intent?) {
		Log.d(Constants.LOG_TAG, "Received intent in CredentialProviderReceiver")

		val sharedPreferences = context?.getSharedPreferences(context?.packageName,
		Context.MODE_PRIVATE)
		sharedPreferences?.edit()?.remove(UserConfigRepo.DEFAULT_PROVIDER)?.commit()
		}
		}
		No newline at end of file

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

+7 −53

Original line number	Diff line number	Diff line
		@@ -255,7 +255,8 @@ class CredentialSelectorViewModel(
		disabledProviders = prevUiState.disabledProviders,
		defaultProviderIdPreferredByApp =
		prevUiState.requestDisplayInfo.appPreferredDefaultProviderId,
		defaultProviderIdSetByUser = userConfigRepo.getDefaultProviderId(),
		defaultProviderIdsSetByUser =
		prevUiState.requestDisplayInfo.userSetDefaultProviderIds,
		requestDisplayInfo = prevUiState.requestDisplayInfo,
		isOnPasskeyIntroStateAlready = true,
		isPasskeyFirstUse = userConfigRepo.getIsPasskeyFirstUse()
		@@ -269,28 +270,10 @@ class CredentialSelectorViewModel(
		userConfigRepo.setIsPasskeyFirstUse(false)
		}

		fun createFlowOnMoreOptionsSelectedOnProviderSelection() {
		uiState = uiState.copy(
		createCredentialUiState = uiState.createCredentialUiState?.copy(
		currentScreenState = CreateScreenState.MORE_OPTIONS_SELECTION,
		isFromProviderSelection = true
		)
		)
		}

		fun createFlowOnMoreOptionsSelectedOnCreationSelection() {
		uiState = uiState.copy(
		createCredentialUiState = uiState.createCredentialUiState?.copy(
		currentScreenState = CreateScreenState.MORE_OPTIONS_SELECTION,
		isFromProviderSelection = false
		)
		)
		}

		fun createFlowOnBackProviderSelectionButtonSelected() {
		uiState = uiState.copy(
		createCredentialUiState = uiState.createCredentialUiState?.copy(
		currentScreenState = CreateScreenState.PROVIDER_SELECTION,
		)
		)
		}
		@@ -315,7 +298,10 @@ class CredentialSelectorViewModel(
		uiState = uiState.copy(
		createCredentialUiState = uiState.createCredentialUiState?.copy(
		currentScreenState =
		if (activeEntry.activeProvider.id == userConfigRepo.getDefaultProviderId() \|\|
		if (uiState.createCredentialUiState?.requestDisplayInfo?.userSetDefaultProviderIds
		?.contains(activeEntry.activeProvider.id) ?: true \|\|
		!(uiState.createCredentialUiState?.foundCandidateFromUserDefaultProvider
		?: false) \|\|
		!TextUtils.isEmpty(uiState.createCredentialUiState?.requestDisplayInfo
		?.appPreferredDefaultProviderId))
		CreateScreenState.CREATION_OPTION_SELECTION
		@@ -325,18 +311,7 @@ class CredentialSelectorViewModel(
		)
		}

		fun createFlowOnEntrySelectedFromFirstUseScreen(activeEntry: ActiveEntry) {
		val providerId = activeEntry.activeProvider.id
		createFlowOnDefaultChanged(providerId)
		uiState = uiState.copy(
		createCredentialUiState = uiState.createCredentialUiState?.copy(
		currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,
		activeEntry = activeEntry
		)
		)
		}

		fun createFlowOnDisabledProvidersSelected() {
		fun createFlowOnLaunchSettings() {
		credManRepo.onSettingLaunchCancel()
		uiState = uiState.copy(dialogState = DialogState.CANCELED_FOR_SETTINGS)
		}
		@@ -349,16 +324,6 @@ class CredentialSelectorViewModel(
		)
		}

		fun createFlowOnChangeDefaultSelected() {
		uiState = uiState.copy(
		createCredentialUiState = uiState.createCredentialUiState?.copy(
		currentScreenState = CreateScreenState.CREATION_OPTION_SELECTION,
		)
		)
		val providerId = uiState.createCredentialUiState?.activeEntry?.activeProvider?.id
		createFlowOnDefaultChanged(providerId)
		}

		fun createFlowOnUseOnceSelected() {
		uiState = uiState.copy(
		createCredentialUiState = uiState.createCredentialUiState?.copy(
		@@ -367,17 +332,6 @@ class CredentialSelectorViewModel(
		)
		}

		fun createFlowOnDefaultChanged(providerId: String?) {
		if (providerId != null) {
		Log.d(
		Constants.LOG_TAG, "Default provider changed to: " +
		" {provider=$providerId")
		userConfigRepo.setDefaultProvider(providerId)
		} else {
		Log.w(Constants.LOG_TAG, "Null provider is being changed")
		}
		}

		fun createFlowOnEntrySelected(selectedEntry: BaseEntry) {
		val providerId = selectedEntry.providerId
		val entryKey = selectedEntry.entryKey

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

+52 −50

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import androidx.credentials.provider.PasswordCredentialEntry
		import androidx.credentials.provider.PublicKeyCredentialEntry
		import androidx.credentials.provider.RemoteEntry
		import org.json.JSONObject
		import java.time.Instant

		// TODO: remove all !! checks
		fun getAppLabel(
		@@ -420,7 +421,7 @@ class CreateFlowUtils {
		id = it.providerFlattenedComponentName,
		displayName = providerLabel,
		icon = providerIcon,
		createOptions = toCreationOptionInfoList(
		sortedCreateOptions = toSortedCreationOptionInfoList(
		it.providerFlattenedComponentName, it.saveEntries, context
		),
		remoteEntry = toRemoteInfo(it.providerFlattenedComponentName, it.remoteEntry),
		@@ -483,6 +484,7 @@ class CreateFlowUtils {
		context.getDrawable(R.drawable.ic_password_24) ?: return null,
		preferImmediatelyAvailableCredentials = false,
		appPreferredDefaultProviderId = appPreferredDefaultProviderId,
		userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(),
		)
		is CreatePublicKeyCredentialRequest -> {
		newRequestDisplayInfoFromPasskeyJson(
		@@ -492,6 +494,7 @@ class CreateFlowUtils {
		preferImmediatelyAvailableCredentials =
		createCredentialRequestJetpack.preferImmediatelyAvailableCredentials,
		appPreferredDefaultProviderId = appPreferredDefaultProviderId,
		userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(),
		)
		}
		is CreateCustomCredentialRequest -> {
		@@ -508,6 +511,7 @@ class CreateFlowUtils {
		?: context.getDrawable(R.drawable.ic_other_sign_in_24) ?: return null,
		preferImmediatelyAvailableCredentials = false,
		appPreferredDefaultProviderId = appPreferredDefaultProviderId,
		userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(),
		)
		}
		else -> null
		@@ -518,13 +522,13 @@ class CreateFlowUtils {
		enabledProviders: List<EnabledProviderInfo>,
		disabledProviders: List<DisabledProviderInfo>?,
		defaultProviderIdPreferredByApp: String?,
		defaultProviderIdSetByUser: String?,
		defaultProviderIdsSetByUser: Set<String>,
		requestDisplayInfo: RequestDisplayInfo,
		isOnPasskeyIntroStateAlready: Boolean,
		isPasskeyFirstUse: Boolean,
		): CreateCredentialUiState? {
		var lastSeenProviderWithNonEmptyCreateOptions: EnabledProviderInfo? = null
		var remoteEntry: RemoteInfo? = null
		var remoteEntryProvider: EnabledProviderInfo? = null
		var defaultProviderPreferredByApp: EnabledProviderInfo? = null
		var defaultProviderSetByUser: EnabledProviderInfo? = null
		var createOptionsPairs:
		@@ -535,14 +539,24 @@ class CreateFlowUtils {
		defaultProviderPreferredByApp = enabledProvider
		}
		}
		if (defaultProviderIdSetByUser != null) {
		if (enabledProvider.id == defaultProviderIdSetByUser) {
		if (enabledProvider.sortedCreateOptions.isNotEmpty() &&
		defaultProviderIdsSetByUser.contains(enabledProvider.id)) {
		if (defaultProviderSetByUser == null) {
		defaultProviderSetByUser = enabledProvider
		} else {
		val newLastUsedTime = enabledProvider.sortedCreateOptions.firstOrNull()
		?.lastUsedTime
		val curLastUsedTime = defaultProviderSetByUser?.sortedCreateOptions
		?.firstOrNull()?.lastUsedTime ?: Instant.MIN
		if (newLastUsedTime != null) {
		if (curLastUsedTime == null \|\| newLastUsedTime > curLastUsedTime) {
		defaultProviderSetByUser = enabledProvider
		}
		}
		}
		if (enabledProvider.createOptions.isNotEmpty()) {
		lastSeenProviderWithNonEmptyCreateOptions = enabledProvider
		enabledProvider.createOptions.forEach {
		}
		if (enabledProvider.sortedCreateOptions.isNotEmpty()) {
		enabledProvider.sortedCreateOptions.forEach {
		createOptionsPairs.add(Pair(it, enabledProvider))
		}
		}
		@@ -554,6 +568,7 @@ class CreateFlowUtils {
		return null
		}
		remoteEntry = currRemoteEntry
		remoteEntryProvider = enabledProvider
		}
		}
		val defaultProvider = defaultProviderPreferredByApp ?: defaultProviderSetByUser
		@@ -561,27 +576,26 @@ class CreateFlowUtils {
		createOptionSize = createOptionsPairs.size,
		isOnPasskeyIntroStateAlready = isOnPasskeyIntroStateAlready,
		requestDisplayInfo = requestDisplayInfo,
		defaultProvider = defaultProvider,
		remoteEntry = remoteEntry,
		isPasskeyFirstUse = isPasskeyFirstUse
		) ?: return null
		val sortedCreateOptionsPairs = createOptionsPairs.sortedWith(
		compareByDescending { it.first.lastUsedTime }
		)
		return CreateCredentialUiState(
		enabledProviders = enabledProviders,
		disabledProviders = disabledProviders,
		currentScreenState = initialScreenState,
		requestDisplayInfo = requestDisplayInfo,
		sortedCreateOptionsPairs = createOptionsPairs.sortedWith(
		compareByDescending { it.first.lastUsedTime }
		),
		hasDefaultProvider = defaultProvider != null,
		sortedCreateOptionsPairs = sortedCreateOptionsPairs,
		activeEntry = toActiveEntry(
		/defaultProvider=/defaultProvider,
		/createOptionSize=/createOptionsPairs.size,
		/lastSeenProviderWithNonEmptyCreateOptions=/
		lastSeenProviderWithNonEmptyCreateOptions,
		/remoteEntry=/remoteEntry
		defaultProvider = defaultProvider,
		sortedCreateOptionsPairs = sortedCreateOptionsPairs,
		remoteEntry = remoteEntry,
		remoteEntryProvider = remoteEntryProvider,
		),
		remoteEntry = remoteEntry,
		foundCandidateFromUserDefaultProvider = defaultProviderSetByUser != null,
		)
		}

		@@ -589,59 +603,43 @@ class CreateFlowUtils {
		createOptionSize: Int,
		isOnPasskeyIntroStateAlready: Boolean,
		requestDisplayInfo: RequestDisplayInfo,
		defaultProvider: EnabledProviderInfo?,
		remoteEntry: RemoteInfo?,
		isPasskeyFirstUse: Boolean,
		): CreateScreenState? {
		return if (isPasskeyFirstUse && requestDisplayInfo.type ==
		CredentialType.PASSKEY && !isOnPasskeyIntroStateAlready) {
		return if (isPasskeyFirstUse && requestDisplayInfo.type == CredentialType.PASSKEY &&
		!isOnPasskeyIntroStateAlready) {
		CreateScreenState.PASSKEY_INTRO
		} else if ((defaultProvider == null \|\| defaultProvider.createOptions.isEmpty()) &&
		createOptionSize > 1) {
		CreateScreenState.PROVIDER_SELECTION
		} else if (((defaultProvider == null \|\| defaultProvider.createOptions.isEmpty()) &&
		createOptionSize == 1) \|\| (defaultProvider != null &&
		defaultProvider.createOptions.isNotEmpty())) {
		CreateScreenState.CREATION_OPTION_SELECTION
		} else if (createOptionSize == 0 && remoteEntry != null) {
		CreateScreenState.EXTERNAL_ONLY_SELECTION
		} else {
		Log.d(
		Constants.LOG_TAG,
		"Unexpected failure: the screen state failed to instantiate" +
		" because the provider list is empty."
		)
		null
		CreateScreenState.CREATION_OPTION_SELECTION
		}
		}

		private fun toActiveEntry(
		defaultProvider: EnabledProviderInfo?,
		createOptionSize: Int,
		lastSeenProviderWithNonEmptyCreateOptions: EnabledProviderInfo?,
		sortedCreateOptionsPairs: List<Pair<CreateOptionInfo, EnabledProviderInfo>>,
		remoteEntry: RemoteInfo?,
		remoteEntryProvider: EnabledProviderInfo?,
		): ActiveEntry? {
		return if (
		defaultProvider != null && defaultProvider.createOptions.isEmpty() &&
		remoteEntry != null
		) {
		ActiveEntry(defaultProvider, remoteEntry)
		} else if (
		defaultProvider != null && defaultProvider.createOptions.isNotEmpty()
		sortedCreateOptionsPairs.isEmpty() && remoteEntry != null &&
		remoteEntryProvider != null
		) {
		ActiveEntry(defaultProvider, defaultProvider.createOptions.first())
		} else if (createOptionSize == 1) {
		ActiveEntry(
		lastSeenProviderWithNonEmptyCreateOptions!!,
		lastSeenProviderWithNonEmptyCreateOptions.createOptions.first()
		)
		ActiveEntry(remoteEntryProvider, remoteEntry)
		} else if (defaultProvider != null &&
		defaultProvider.sortedCreateOptions.isNotEmpty()) {
		ActiveEntry(defaultProvider, defaultProvider.sortedCreateOptions.first())
		} else if (sortedCreateOptionsPairs.isNotEmpty()) {
		val (topEntry, topEntryProvider) = sortedCreateOptionsPairs.first()
		ActiveEntry(topEntryProvider, topEntry)
		} else null
		}

		/**
		* Note: caller required handle empty list due to parsing error.
		*/
		private fun toCreationOptionInfoList(
		private fun toSortedCreationOptionInfoList(
		providerId: String,
		creationEntries: List<Entry>,
		context: Context,
		@@ -664,7 +662,9 @@ class CreateFlowUtils {
		footerDescription = createEntry.description?.toString()
		))
		}
		return result
		return result.sortedWith(
		compareByDescending { it.lastUsedTime }
		)
		}

		private fun toRemoteInfo(
		@@ -690,6 +690,7 @@ class CreateFlowUtils {
		context: Context,
		preferImmediatelyAvailableCredentials: Boolean,
		appPreferredDefaultProviderId: String?,
		userSetDefaultProviderIds: Set<String>,
		): RequestDisplayInfo? {
		val json = JSONObject(requestJson)
		var passkeyUsername = ""
		@@ -711,6 +712,7 @@ class CreateFlowUtils {
		context.getDrawable(R.drawable.ic_passkey_24) ?: return null,
		preferImmediatelyAvailableCredentials,
		appPreferredDefaultProviderId,
		userSetDefaultProviderIds,
		)
		}
		}