Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-25 20:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update backup related strings.

Browse Source
This commit is contained in:
Michelle Tang
2025-09-03 10:38:02 -04:00
committed by Greyson Parrelli
parent a7ac138ea3
commit 33645c302b
3 changed files with 91 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt
View File

@@ -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),

13
app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSyncBottomSheet.kt
View File

@@ -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(