diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java index 0fbb60b03b..715517f62e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java @@ -24,7 +24,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActivity { protected void onCreate(Bundle bundle, boolean ready) { AlertDialog dialog = new MaterialAlertDialogBuilder(this) .setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device)) - .setMessage(getString(R.string.DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner)) + .setMessage(getString(R.string.DeviceProvisioningActivity_to_link_a_desktop_or_ipad_to_this_signal_account)) .setPositiveButton(R.string.DeviceProvisioningActivity_continue, (dialog1, which) -> { startActivity(AppSettingsActivity.linkedDevices(this)); finish(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt index b38263bb81..b0e036e865 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt @@ -92,7 +92,7 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme is MediaCaptureEvent.DeviceLinkScannedFromQrCode -> { MaterialAlertDialogBuilder(requireContext()) .setTitle(R.string.MediaCaptureFragment_device_link_dialog_title) - .setMessage(R.string.MediaCaptureFragment_device_link_dialog_body) + .setMessage(R.string.MediaCaptureFragment_it_looks_like_youre_trying) .setPositiveButton(R.string.MediaCaptureFragment_device_link_dialog_continue) { d, _ -> startActivity(AppSettingsActivity.linkedDevices(requireContext())) requireActivity().finish() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e5bd0f3dcd..c843f9fc4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2113,7 +2113,7 @@ Sorry, you have too many devices linked already, try removing some Sorry, this is not a valid device link QR code. Link a Signal device? - It looks like you\'re trying to link a Signal device using a 3rd party scanner. For your protection, please scan the code again from within Signal. + To link a desktop or iPad to this Signal account, go to Linked Devices and tap \"Link a New Device\"and scan the QR code again. Make sure you only scan QR codes that come directly from Signal. Signal needs the Camera permission in order to scan a QR code, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\". Unable to scan a QR code without the Camera permission @@ -5745,7 +5745,7 @@ Link device? - It looks like you\'re trying to link a Signal device. Tap continue and scan the code again to link it. + It looks like you\'re trying to link a Signal device. Tap continue and then tap \"Link a New Device\" and scan the QR code again. Continue