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

Streamline invalid qr code dialog in link device flow.

Browse Source
This commit is contained in:
Cody Henthorne
2025-12-19 13:36:17 -05:00
committed by jeffrey-signal
parent 437979373c
commit 0ea3d524da
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt
View File

@@ -77,7 +77,6 @@ class AddLinkDeviceFragment : ComposeFragment() {
viewModel.addDevice(shouldSync = false)
},
onQrCodeDismissed = { viewModel.onQrCodeDismissed() },
onQrCodeRetry = { viewModel.onQrCodeScanned(state.linkUri.toString()) },
onLinkDeviceSuccess = {
viewModel.onLinkDeviceResult(showSheet = true)
},
@@ -110,7 +109,6 @@ private fun MainScreen(
onQrCodeScanned: (String) -> Unit = {},
onQrCodeApproved: () -> Unit = {},
onQrCodeDismissed: () -> Unit = {},
onQrCodeRetry: () -> Unit = {},
onLinkDeviceSuccess: () -> Unit = {},
onLinkDeviceFailure: () -> Unit = {}
) {
@@ -133,7 +131,6 @@ private fun MainScreen(
onQrCodeScanned = onQrCodeScanned,
onQrCodeAccepted = onQrCodeApproved,
onQrCodeDismissed = onQrCodeDismissed,
onQrCodeRetry = onQrCodeRetry,
linkDeviceResult = state.linkDeviceResult,
onLinkDeviceSuccess = onLinkDeviceSuccess,
onLinkDeviceFailure = onLinkDeviceFailure,

10
app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt
View File

@@ -34,7 +34,6 @@ fun LinkDeviceQrScanScreen(
onQrCodeScanned: (String) -> Unit,
onQrCodeAccepted: () -> Unit,
onQrCodeDismissed: () -> Unit,
onQrCodeRetry: () -> Unit,
linkDeviceResult: LinkDeviceResult,
onLinkDeviceSuccess: () -> Unit,
onLinkDeviceFailure: () -> Unit,
@@ -45,12 +44,11 @@ fun LinkDeviceQrScanScreen(
val context = LocalContext.current
when (qrCodeState) {
LinkDeviceSettingsState.QrCodeState.NONE -> {
Unit
}
LinkDeviceSettingsState.QrCodeState.NONE -> Unit
LinkDeviceSettingsState.QrCodeState.VALID_WITH_SYNC -> {
navController?.safeNavigate(R.id.action_addLinkDeviceFragment_to_linkDeviceSyncBottomSheet)
}
LinkDeviceSettingsState.QrCodeState.VALID_WITHOUT_SYNC -> {
Dialogs.SimpleAlertDialog(
title = stringResource(id = R.string.DeviceProvisioningActivity_link_this_device),
@@ -61,13 +59,13 @@ fun LinkDeviceQrScanScreen(
onDismiss = onQrCodeDismissed
)
}
LinkDeviceSettingsState.QrCodeState.INVALID -> {
Dialogs.SimpleAlertDialog(
title = stringResource(id = R.string.AddLinkDeviceFragment__linking_device_failed),
body = stringResource(id = R.string.AddLinkDeviceFragment__this_qr_code_not_valid),
confirm = stringResource(id = R.string.AddLinkDeviceFragment__retry),
onConfirm = onQrCodeRetry,
dismiss = stringResource(id = android.R.string.cancel),
onConfirm = { },
onDismiss = onQrCodeDismissed
)
}