Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve backup key password manager save error handling.

Browse Source 
- Add "go to settings" button to missing credential manager error dialog.
- Add handling for disabled password manager save prompt on Android API <= 33.
This commit is contained in:
jeffrey-signal
2025-06-27 09:42:32 -04:00
committed by Greyson Parrelli
parent 0a17cd1c99
commit fdf1238905
5 changed files with 97 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt
View File

@@ -33,6 +33,7 @@ import org.signal.core.util.getSerializableCompat
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.backup.DeletionState
import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
import org.thoughtcrime.securesms.components.settings.app.backups.remote.BackupKeyCredentialManagerHandler
import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentCheckoutDelegate
import org.thoughtcrime.securesms.compose.ComposeFragment
import org.thoughtcrime.securesms.compose.Nav
@@ -150,7 +151,11 @@ class MessageBackupsFlowFragment : ComposeFragment(), InAppPaymentCheckoutDelega
},
onRequestSaveToPasswordManager = viewModel::onBackupKeySaveRequested,
onConfirmSaveToPasswordManager = viewModel::onBackupKeySaveConfirmed,
onSaveToPasswordManagerComplete = viewModel::onBackupKeySaveCompleted
onSaveToPasswordManagerComplete = viewModel::onBackupKeySaveCompleted,
onGoToDeviceSettingsClick = {
val intent = BackupKeyCredentialManagerHandler.getCredentialManagerSettingsIntent(requireContext())
requireContext().startActivity(intent)
}
)
}

42
app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt
View File

@@ -51,6 +51,7 @@ import org.signal.core.ui.compose.Snackbars
import org.signal.core.ui.compose.theme.SignalTheme
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.settings.app.backups.remote.BackupKeyCredentialManagerHandler
import org.thoughtcrime.securesms.components.settings.app.backups.remote.BackupKeySaveState
import org.thoughtcrime.securesms.components.settings.app.backups.remote.CredentialManagerError
import org.thoughtcrime.securesms.components.settings.app.backups.remote.CredentialManagerResult
@@ -72,7 +73,8 @@ fun MessageBackupsKeyRecordScreen(
onRequestSaveToPasswordManager: () -> Unit = {},
onConfirmSaveToPasswordManager: () -> Unit = {},
onSaveToPasswordManagerComplete: (CredentialManagerResult) -> Unit = {},
onNextClick: () -> Unit = {}
onNextClick: () -> Unit = {},
onGoToDeviceSettingsClick: () -> Unit = {}
) {
val snackbarHostState = remember { SnackbarHostState() }
val backupKeyString = remember(backupKey) {
@@ -163,7 +165,7 @@ fun MessageBackupsKeyRecordScreen(
}
}
if (Build.VERSION.SDK_INT >= 24) {
if (BackupKeyCredentialManagerHandler.isCredentialManagerSupported) {
item {
Buttons.Small(
onClick = { onRequestSaveToPasswordManager() }
@@ -220,13 +222,30 @@ fun MessageBackupsKeyRecordScreen(
}
is BackupKeySaveState.Error -> {
if (keySaveState.errorType is CredentialManagerError.MissingCredentialManager) {
Dialogs.SimpleMessageDialog(
title = stringResource(R.string.MessageBackupsKeyRecordScreen__missing_password_manager_title),
message = stringResource(R.string.MessageBackupsKeyRecordScreen__missing_password_manager_message),
dismiss = stringResource(android.R.string.ok),
onDismiss = { onSaveToPasswordManagerComplete(CredentialManagerResult.UserCanceled) }
)
when (keySaveState.errorType) {
is CredentialManagerError.MissingCredentialManager -> {
Dialogs.SimpleAlertDialog(
title = stringResource(R.string.MessageBackupsKeyRecordScreen__cant_save_to_password_manager_title),
body = stringResource(R.string.MessageBackupsKeyRecordScreen__missing_password_manager_message),
confirm = stringResource(R.string.MessageBackupsKeyRecordScreen__go_to_settings),
onConfirm = { onGoToDeviceSettingsClick() },
dismiss = stringResource(android.R.string.cancel),
onDismiss = { onSaveToPasswordManagerComplete(CredentialManagerResult.UserCanceled) }
)
}
is CredentialManagerError.SavePromptDisabled -> {
Dialogs.SimpleAlertDialog(
title = stringResource(R.string.MessageBackupsKeyRecordScreen__cant_save_to_password_manager_title),
body = stringResource(R.string.MessageBackupsKeyRecordScreen__missing_password_manager_message),
confirm = stringResource(R.string.MessageBackupsKeyRecordScreen__go_to_settings),
onConfirm = { onGoToDeviceSettingsClick() },
dismiss = stringResource(android.R.string.cancel),
onDismiss = { onSaveToPasswordManagerComplete(CredentialManagerResult.UserCanceled) }
)
}
is CredentialManagerError.Unexpected -> Unit
}
}
@@ -271,6 +290,11 @@ private suspend fun saveKeyToCredentialManager(
CredentialManagerError.MissingCredentialManager(e)
}
e.message?.contains("[28435]") == true -> {
Log.w(TAG, "CreateCredentialUnknownException: \"${e.message}\"")
CredentialManagerError.SavePromptDisabled(e)
}
else -> CredentialManagerError.Unexpected(e)
}
}