From e9d3f600facc88de35212ec551eb5a8d857293db Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 10 Feb 2022 09:37:00 -0300 Subject: [PATCH] Improve mailbox pairing strings --- .../mailbox/SetupDownloadFragment.java | 5 +---- briar-android/src/main/res/values/strings.xml | 22 ++++++++----------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java index 2ca7484f5..1edbf18db 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java @@ -91,11 +91,8 @@ public class SetupDownloadFragment extends Fragment { private void shareLink(View v) { Context ctx = requireContext(); - String fdroid = ctx.getString(R.string.mailbox_share_fdroid); - String gplay = ctx.getString(R.string.mailbox_share_gplay); String download = ctx.getString(R.string.mailbox_share_download); - String text = ctx.getString(R.string.mailbox_share_text, fdroid, gplay, - download); + String text = ctx.getString(R.string.mailbox_share_text, download); Intent sendIntent = new Intent(); sendIntent.setAction(ACTION_SEND); diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 02622774b..bcec70806 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -615,25 +615,21 @@ Mailbox Mailbox Setup - Once you set up a Mailbox for Briar, you will be able to send and receive messages even if you are not online.\n - \nYou can install Briar Mailbox on a spare device which will act as a forwarder for your messages (for best connectivity, the Mailbox device should stay charged and online at all times). - Once you installed the Briar Mailbox app on a spare device, you can link it with this device by scanning the Mailbox QR code on the next screen.\n - \nYou can find Briar Mailbox on F-Droid or Google Play. + Once you set up a Mailbox for Briar, your contacts will be able to send you messages while you are offline.\n + \nInstall the Briar Mailbox app on a spare device. The Mailbox will receive your messages and store them until you come online.\n + \nKeep the Mailbox device connected to power and Wi-Fi so it\'s always online. + Once you\'ve installed the Briar Mailbox app on a spare device, link it with this device by scanning your Mailbox\'s QR code.\n + \nYou can find the \"Briar Mailbox\" app on Google Play or wherever you downloaded Briar. Share Download Link Scan Mailbox QR code - You can install the Briar Mailbox app from one of those sources:\n - \nF-Droid: %1$s - \nGoogle Play: %2$s - \nDirect Download: %3$s - https://f-droid.org/packages/org.briarproject.mailbox/ - https://play.google.com/store/apps/details?id=org.briarproject.mailbox - https://briarproject.org/apk + Briar Mailbox download information is available here: %s + https://briarproject.org/download You have denied access to the camera, but scanning a QR code requires using the camera.\n\nPlease consider granting access. Connecting… Wrong QR code - The scanned code is invalid. Please open the Briar Mailbox app and scan the QR code it presents. + The scanned code is invalid. Please open the Briar Mailbox app on your mailbox device and scan the QR code it presents. Offline - Ensure that this device is online and connections to the internet are allowed.\n\nAfterwards, wait for the globe icon in connection settings needs to turn green. + Ensure that this device is online and connections to the internet are allowed.\n\nAfterwards, wait for the globe icon in connection settings to turn green. Check connection settings