Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-20 08:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Never sync trim deletes from linked devices.

Browse Source
This commit is contained in:
Cody Henthorne
2026-07-20 11:21:25 -04:00
parent 0e1d60bf1d
commit 7c464a7759
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
+8 -6
View File
@@ -334,12 +334,14 @@ private fun ManageStorageSettingsScreen(
onClick = onSetChatLengthLimit
)
Rows.ToggleRow(
text = stringResource(id = R.string.ManageStorageSettingsFragment_apply_limits_title),
label = stringResource(id = R.string.ManageStorageSettingsFragment_apply_limits_description),
checked = state.syncTrimDeletes,
onCheckChanged = onSyncTrimThreadDeletes
)
if (state.isPrimary) {
Rows.ToggleRow(
text = stringResource(id = R.string.ManageStorageSettingsFragment_apply_limits_title),
label = stringResource(id = R.string.ManageStorageSettingsFragment_apply_limits_description),
checked = state.syncTrimDeletes,
onCheckChanged = onSyncTrimThreadDeletes
)
}
Dividers.Default()
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsViewModel.kt
+4 -2
View File
@@ -36,7 +36,8 @@ class ManageStorageSettingsViewModel : ViewModel() {
keepMessagesDuration = SignalStore.settings.keepMessagesDuration,
lengthLimit = if (SignalStore.settings.isTrimByLengthEnabled) SignalStore.settings.threadTrimLength else ManageStorageState.NO_LIMIT,
syncTrimDeletes = SignalStore.settings.shouldSyncThreadTrimDeletes(),
localBackupsEnabled = SignalStore.backup.newLocalBackupsEnabled
localBackupsEnabled = SignalStore.backup.newLocalBackupsEnabled,
isPrimary = SignalStore.account.isPrimaryDevice
)
)
val state = store.asStateFlow()
@@ -182,7 +183,8 @@ class ManageStorageSettingsViewModel : ViewModel() {
val onDeviceStorageOptimizationState: OnDeviceStorageOptimizationState = OnDeviceStorageOptimizationState.FEATURE_NOT_AVAILABLE,
val storageOptimizationStateChanged: Boolean = false,
val isPaidTierPending: Boolean = false,
val localBackupsEnabled: Boolean = false
val localBackupsEnabled: Boolean = false,
val isPrimary: Boolean = true
) {
companion object {
const val NO_LIMIT = 0
app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
+1 -1
View File
@@ -197,7 +197,7 @@ public final class SettingsValues extends SignalStoreValues {
setSyncThreadTrimDeletes(!isTrimByLengthEnabled() && getKeepMessagesDuration() == KeepMessagesDuration.FOREVER);
}
return getBoolean(THREAD_TRIM_SYNC_TO_LINKED_DEVICES, true);
return getBoolean(THREAD_TRIM_SYNC_TO_LINKED_DEVICES, true) && SignalStore.account().isPrimaryDevice();
}
public void setSyncThreadTrimDeletes(boolean syncDeletes) {