diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt index 83cf43367f..c481ec6c54 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt @@ -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, diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt index d0fd8f2822..42e4f75ab1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt @@ -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 ) }