diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
index f086b43a9f..8fa7f50299 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
@@ -103,7 +103,6 @@ import org.thoughtcrime.securesms.backup.v2.ui.status.RestoreType
import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
import org.thoughtcrime.securesms.billing.launchManageBackupsSubscription
import org.thoughtcrime.securesms.components.compose.BetaHeader
-import org.thoughtcrime.securesms.components.compose.TextWithBetaLabel
import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
import org.thoughtcrime.securesms.components.settings.app.backups.BackupState
import org.thoughtcrime.securesms.components.settings.app.subscription.MessageBackupsCheckoutLauncher.createBackupsCheckoutLauncher
@@ -420,9 +419,9 @@ private fun RemoteBackupsSettingsContent(
Scaffold(
topBar = {
Scaffolds.DefaultTopAppBar(
- title = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups),
+ title = stringResource(R.string.RemoteBackupsSettingsFragment__secure_backups),
titleContent = { _, title ->
- TextWithBetaLabel(text = title, textStyle = MaterialTheme.typography.titleLarge)
+ Text(text = title, style = MaterialTheme.typography.titleLarge)
},
onNavigationClick = contentCallbacks::onNavigationClick,
navigationIcon = ImageVector.vectorResource(R.drawable.symbol_arrow_start_24),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt
index 067d79e18d..4933131547 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt
@@ -28,6 +28,7 @@ import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.SignalPreview
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.keyvalue.SignalStore
/**
* Bottom sheet dialog allowing users to choose whether to transfer their message history
@@ -42,7 +43,8 @@ class LinkDeviceSyncBottomSheet : ComposeBottomSheetDialogFragment() {
onLink = { shouldSync ->
viewModel.addDevice(shouldSync)
findNavController().popBackStack(R.id.linkDeviceFragment, false)
- }
+ },
+ enabledMediaBackups = SignalStore.backup.backsUpMedia
)
}
@@ -54,7 +56,8 @@ class LinkDeviceSyncBottomSheet : ComposeBottomSheetDialogFragment() {
@Composable
fun SyncSheet(
- onLink: (Boolean) -> Unit
+ onLink: (Boolean) -> Unit,
+ enabledMediaBackups: Boolean = false
) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
@@ -66,7 +69,11 @@ fun SyncSheet(
SheetOption(
painterResource(R.drawable.symbol_chat_check),
stringResource(R.string.LinkDeviceSyncBottomSheet_transfer),
- stringResource(R.string.LinkDeviceSyncBottomSheet_transfer_your_text)
+ if (enabledMediaBackups) {
+ stringResource(R.string.LinkDeviceSyncBottomSheet_transfer_your_text_and_all_media)
+ } else {
+ stringResource(R.string.LinkDeviceSyncBottomSheet_transfer_your_text)
+ }
) { onLink(true) }
SheetOption(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e94d5e0f19..de4db03218 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1139,6 +1139,8 @@
Transfer message history
Transfer your text messages and your last 45 days of media
+
+ Transfer your text messages and media
Don\'t transfer
@@ -5370,7 +5372,7 @@
- Renew your Signal Backups subscription
+ Renew your Signal Secure Backups subscription
Couldn\'t complete backup
@@ -7744,7 +7746,7 @@
Deny all
- Turn on Signal Backups
+ Turn on Signal Secure Backups
Never lose a message when you get a new phone or reinstall Signal.
@@ -7752,17 +7754,17 @@
Not now
-
- Verify your backup key
-
+
+ Verify your recovery key
+
We\'ll occasionally ask you to verify your key to ensure you still know it
-
+
Verify
-
+
Not now
-
- Backup key correct. Keep your key safe.
-
+
+ Recovery key correct. Keep your key safe.
+
We will ask you again in a week.
@@ -7908,7 +7910,7 @@
Your subscription couldn\'t be renewed with your payment method. To continue backing up media you need an active subscription.
- You\'ll continue to have access to the free Signal Backups plan.
+ You\'ll continue to have access to the free Signal Secure Backups plan.
Couldn\'t complete backup
@@ -8071,13 +8073,13 @@
Unused media will be offloaded, but can be downloaded from your backup anytime.
- Storage optimization can only be used with the paid tier of Signal Backups. Your backups subscription is still processing and not yet active. Please try again later.
+ Storage optimization can only be used with the paid tier of Signal Secure Backups. Your backups subscription is still processing and not yet active. Please try again later.
Upgrade to enable this feature
- Storage optimization can only be used with the paid tier of Signal Backups. Upgrade your backup plan to start using this feature.
+ Storage optimization can only be used with the paid tier of Signal Secure Backups. Upgrade your backup plan to start using this feature.
Subscribe for %1$s/month
@@ -8096,7 +8098,7 @@
This media is no longer available
- To start backing up all your media, enable Signal Backups and choose the paid tier.
+ To start backing up all your media, enable Signal Secure Backups and choose the paid tier.
Continue
@@ -8140,8 +8142,10 @@
Cancel upload
+
+ Secure Backups
- Signal Backups
+ Signal Secure Backups
Authentication required
@@ -8158,10 +8162,10 @@
Backup frequency
Back up using cellular
-
- View backup key
-
- Unlock to view backup key
+
+ View recovery key
+
+ Unlock to view recovery key
To view your key, confirm it\'s you
@@ -8177,7 +8181,7 @@
Backup will be created overnight.
- New backup key created
+ New recovery key created
Subscription inactive
@@ -8255,11 +8259,11 @@
Depending on the size of your backup, this could take a long time. You can use your phone as you normally do while the download takes place.
- Your subscription was not found on this device. Renew to continue using Signal Backups.
+ Your subscription was not found on this device. Renew to continue using Signal Secure Backups.
- - Your subscription on this device is valid for the next %1$d day. Renew to continue using Signal Backups
- - Your subscription on this device is valid for the next %1$d days. Renew to continue using Signal Backups
+ - Your subscription on this device is valid for the next %1$d day. Renew to continue using Signal Secure Backups
+ - Your subscription on this device is valid for the next %1$d days. Renew to continue using Signal Secure Backups
Resubscribe
@@ -8382,9 +8386,9 @@
- Your backup key
+ Your recovery key
- Your backup key is a 64-character code that lets you restore your backup when you re-install Signal.
+ Your recovery key is a 64-character code that lets you restore your backup when you re-install Signal.
If you forget your key, you will not be able to restore your backup. Signal cannot help you recover your backup.
@@ -8392,26 +8396,26 @@
- Record your backup key
+ Record your recovery key
This key is required to recover your account and data. Store this key somewhere safe. If you lose it, you won’t be able to recover your account.
Copy to clipboard
-
+
Save to password manager
-
+
Save to password manager?
-
- Only store your backup key in a password manager that you trust is secure. Signal does not make a recommendation on which password manager is right for you.
-
- Signal Backups
-
+
+ Only store your recovery key in a password manager that you trust is secure. Signal does not make a recommendation on which password manager is right for you.
+
+ Signal Secure Backups
+
Saved to your password manager
-
+
Can\'t save to password manager
-
+
You don\'t have a password manager set up, or the password manager you\'re using isn\'t supported.
-
+
You previously chose not to save passwords for Signal to Google Password Manager. In your Google Password Manager settings, remove Signal from \"Declined sites and apps\" and try again.
Go to settings
@@ -8432,11 +8436,11 @@
Download media
- To create a new backup key, you must turn off \"Optimize storage\" and wait until your media has been downloaded. When the download is complete, you can create a new key.
+ To create a new recovery key, you must turn off \"Optimize storage\" and wait until your media has been downloaded. When the download is complete, you can create a new key.
Turn off and download
- Create a new backup key
+ Create a new recovery key
Creating a new key is only necessary if someone else knows your key. You will have to re-upload your backup, including media. If you are using \"Optimize storage\" you will have to download offloaded media first.
@@ -8444,30 +8448,30 @@
Cancel key creation?
- Your new backup key won\'t be created unless you confirm it.
-
+ Your new recovery key won\'t be created unless you confirm it.
+
Confirm key
Cancel key creation
- Confirm your backup key
+ Confirm your recovery key
- Enter the backup key that you just recorded
+ Enter the recovery key that you just recorded
- Backup key
+ Recovery key
- Incorrect backup key
+ Incorrect recovery key
See key again
Next
- Enter your backup key
+ Enter your recovery key
Enter the 64-digit code you recorded when you enabled backups.
-
+
Forgot key?
@@ -8543,9 +8547,9 @@
Restore or transfer account
Get your Signal account and message history onto this device.
-
- From Signal Backups
-
+
+ From Signal Secure Backups
+
Your free or paid Signal Backup plan
From a backup folder
@@ -8563,40 +8567,40 @@
Restore your messages from the backup you saved on your device. If you don\'t restore now, you won\'t be able to restore later.
-
- Enter your backup key
-
- Your backup key is a 64-character code required to recover your account and data.
-
- No backup key?
-
- Backup key
-
- Backups can\'t be recovered without their 64-character recovery code. If you\'ve lost your backup key Signal can\'t help restore your backup.
-
- If you have your old device you can view your backup key in Settings > Backups. Then tap View backup key.
-
+
+ Enter your recovery key
+
+ Your recovery key is a 64-character code required to recover your account and data.
+
+ No recovery key?
+
+ Recovery key
+
+ Backups can\'t be recovered without their 64-character recovery code. If you\'ve lost your recovery key Signal can\'t help restore your backup.
+
+ If you have your old device you can view your recovery key in Settings > Backups. Then tap View recovery key.
+
Learn more
-
+
Skip and don\'t restore
- Incorrect backup key
+ Incorrect recovery key
- Make sure you\'re registering with the same phone number and 64-character backup key you saved when enabling Signal backups. Backups can not be recovered without this key.
-
+ Make sure you\'re registering with the same phone number and 64-character recovery key you saved when enabling Signal Secure Backups. Backups can not be recovered without this key.
+
Try again
-
- Backup key help
-
- Incorrect backup key
-
+
+ Recovery key help
+
+ Incorrect recovery key
+
Too long (%1$d/%2$d)
-
- Invalid backup key
+
+ Invalid recovery key
Backup not found
- The backup key you entered is correct, but there is no backup associated with it. If you still have your old phone, make sure backups are enabled and that a backup has been completed and try again.
+ The recovery key you entered is correct, but there is no backup associated with it. If you still have your old phone, make sure backups are enabled and that a backup has been completed and try again.
Skip restore
@@ -8675,7 +8679,7 @@
No Backup to Restore
- Because you\'re moving from iPhone to Android, the only way to transfer your messages and media is by enabling Signal Backups on your old device.
+ Because you\'re moving from iPhone to Android, the only way to transfer your messages and media is by enabling Signal Secure Backups on your old device.
Open Signal on your old device