Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Credential manager UI changes to fix the issue that UI app uses same repo instance for different activities"

Browse Source
This commit is contained in:
Qinmei Du
2023-01-12 04:01:55 +00:00
committed by Android (Google) Code Review
parent 6869a62fe9 efe74cf4a3
commit 59bce679c5
4 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
View File

@@ -152,22 +152,6 @@ class CredentialManagerRepo(
return CreateFlowUtils.toRequestDisplayInfo(requestInfo, context)
}
companion object {
// TODO: find a way to resolve this static field leak problem
lateinit var repo: CredentialManagerRepo
fun setup(
context: Context,
intent: Intent,
) {
repo = CredentialManagerRepo(context, intent)
}
fun getInstance(): CredentialManagerRepo {
return repo
}
}
// TODO: below are prototype functionalities. To be removed for productionization.
private fun testCreateCredentialEnabledProviderList(): List<CreateCredentialProviderData> {
return listOf(

16
packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt
View File

@@ -45,19 +45,19 @@ import kotlinx.coroutines.launch
class CredentialSelectorActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
CredentialManagerRepo.setup(this, intent)
val credManRepo = CredentialManagerRepo(this, intent)
UserConfigRepo.setup(this)
val requestInfo = CredentialManagerRepo.getInstance().requestInfo
val requestInfo = credManRepo.requestInfo
setContent {
CredentialSelectorTheme {
CredentialManagerBottomSheet(DialogType.toDialogType(requestInfo.type))
CredentialManagerBottomSheet(DialogType.toDialogType(requestInfo.type), credManRepo)
}
}
}
@ExperimentalMaterialApi
@Composable
fun CredentialManagerBottomSheet(dialogType: DialogType) {
fun CredentialManagerBottomSheet(dialogType: DialogType, credManRepo: CredentialManagerRepo) {
val providerActivityResult = remember { mutableStateOf<ProviderActivityResult?>(null) }
val launcher = rememberLauncherForActivityResult(
ActivityResultContracts.StartIntentSenderForResult()
@@ -66,7 +66,9 @@ class CredentialSelectorActivity : ComponentActivity() {
}
when (dialogType) {
DialogType.CREATE_PASSKEY -> {
val viewModel: CreateCredentialViewModel = viewModel()
val viewModel: CreateCredentialViewModel = viewModel{
CreateCredentialViewModel(credManRepo)
}
lifecycleScope.launch {
viewModel.observeDialogResult().collect{ dialogResult ->
onCancel(dialogResult)
@@ -79,7 +81,9 @@ class CredentialSelectorActivity : ComponentActivity() {
CreateCredentialScreen(viewModel = viewModel, providerActivityLauncher = launcher)
}
DialogType.GET_CREDENTIALS -> {
val viewModel: GetCredentialViewModel = viewModel()
val viewModel: GetCredentialViewModel = viewModel{
GetCredentialViewModel(credManRepo)
}
lifecycleScope.launch {
viewModel.observeDialogResult().collect{ dialogResult ->
onCancel(dialogResult)

13
packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateCredentialViewModel.kt
View File

@@ -52,10 +52,9 @@ data class CreateCredentialUiState(
)
class CreateCredentialViewModel(
credManRepo: CredentialManagerRepo = CredentialManagerRepo.getInstance(),
userConfigRepo: UserConfigRepo = UserConfigRepo.getInstance()
private val credManRepo: CredentialManagerRepo,
userConfigRepo: UserConfigRepo = UserConfigRepo.getInstance(),
) : ViewModel() {
var providerEnableListUiState = credManRepo.getCreateProviderEnableListInitialUiState()
var providerDisableListUiState = credManRepo.getCreateProviderDisableListInitialUiState()
@@ -142,12 +141,12 @@ class CreateCredentialViewModel(
}
fun onDisabledProvidersSelected() {
CredentialManagerRepo.getInstance().onCancel()
credManRepo.onCancel()
dialogResult.tryEmit(DialogResult(ResultState.LAUNCH_SETTING_CANCELED))
}
fun onCancel() {
CredentialManagerRepo.getInstance().onCancel()
credManRepo.onCancel()
dialogResult.tryEmit(DialogResult(ResultState.NORMAL_CANCELED))
}
@@ -189,7 +188,7 @@ class CreateCredentialViewModel(
hidden = true,
)
} else {
CredentialManagerRepo.getInstance().onOptionSelected(
credManRepo.onOptionSelected(
providerId,
entryKey,
entrySubkey
@@ -243,7 +242,7 @@ class CreateCredentialViewModel(
"$providerId, key=${entry.entryKey}, subkey=${entry.entrySubkey}, " +
"resultCode=$resultCode, resultData=$resultData}"
)
CredentialManagerRepo.getInstance().onOptionSelected(
credManRepo.onOptionSelected(
providerId, entry.entryKey, entry.entrySubkey, resultCode, resultData,
)
} else {

12
packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialViewModel.kt
View File

@@ -46,9 +46,7 @@ data class GetCredentialUiState(
val isNoAccount: Boolean = false,
)
class GetCredentialViewModel(
credManRepo: CredentialManagerRepo = CredentialManagerRepo.getInstance()
) : ViewModel() {
class GetCredentialViewModel(private val credManRepo: CredentialManagerRepo) : ViewModel() {
var uiState by mutableStateOf(credManRepo.getCredentialInitialUiState())
private set
@@ -70,9 +68,7 @@ class GetCredentialViewModel(
hidden = true,
)
} else {
CredentialManagerRepo.getInstance().onOptionSelected(
entry.providerId, entry.entryKey, entry.entrySubkey,
)
credManRepo.onOptionSelected(entry.providerId, entry.entryKey, entry.entrySubkey)
dialogResult.tryEmit(DialogResult(ResultState.COMPLETE))
}
}
@@ -110,7 +106,7 @@ class GetCredentialViewModel(
"${entry.providerId}, key=${entry.entryKey}, subkey=${entry.entrySubkey}, " +
"resultCode=$resultCode, resultData=$resultData}"
)
CredentialManagerRepo.getInstance().onOptionSelected(
credManRepo.onOptionSelected(
entry.providerId, entry.entryKey, entry.entrySubkey,
resultCode, resultData,
)
@@ -144,7 +140,7 @@ class GetCredentialViewModel(
}
fun onCancel() {
CredentialManagerRepo.getInstance().onCancel()
credManRepo.onCancel()
dialogResult.tryEmit(DialogResult(ResultState.NORMAL_CANCELED))
}
}