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

Do not respect optimized media setting from primary on link+sync.

Browse Source
This commit is contained in:
Cody Henthorne
2026-07-20 11:32:50 -04:00
parent 7c464a7759
commit 3fbce0c774
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
+2 -2
View File
@@ -1338,7 +1338,7 @@ object BackupRepository {
SignalDatabase.recipients.setProfileKey(selfId, selfData.profileKey)
SignalDatabase.recipients.setProfileSharing(selfId, true)
val importState = ImportState(mediaRootBackupKey)
val importState = ImportState(mediaRootBackupKey, backupMode)
val chatItemInserter: ChatItemArchiveImporter = ChatItemArchiveProcessor.beginImport(importState)
Log.d(TAG, "[import] Beginning to read frames.")
@@ -2530,7 +2530,7 @@ class ExportState(
var releaseNoteRecipientId: Long? = null
}
class ImportState(val mediaRootBackupKey: MediaRootBackupKey) {
class ImportState(val mediaRootBackupKey: MediaRootBackupKey, val backupMode: BackupMode) {
val remoteToLocalRecipientId: MutableMap<Long, RecipientId> = hashMapOf()
val chatIdToLocalThreadId: MutableMap<Long, Long> = hashMapOf()
val chatIdToLocalRecipientId: MutableMap<Long, RecipientId> = hashMapOf()
app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
+1 -1
View File
@@ -275,7 +275,7 @@ object AccountDataArchiveProcessor {
SignalStore.story.isFeatureDisabled = settings.storiesDisabled
SignalStore.story.userHasSeenGroupStoryEducationSheet = settings.hasSeenGroupStoryEducationSheet
SignalStore.story.viewedReceiptsEnabled = settings.storyViewReceiptsEnabled ?: settings.readReceipts
SignalStore.backup.optimizeStorage = settings.optimizeOnDeviceStorage
SignalStore.backup.optimizeStorage = !importState.backupMode.isLinkAndSync && settings.optimizeOnDeviceStorage
SignalStore.backup.backupTier = MessageBackupTier.fromBackupLevel(settings.backupTier)
SignalStore.settings.sentMediaQuality = settings.defaultSentMediaQuality.toLocalSentMediaQuality()
SignalStore.settings.setTheme(settings.appTheme.toLocalTheme())
app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreOptimizedMediaJob.kt
+5
View File
@@ -31,6 +31,11 @@ class RestoreOptimizedMediaJob private constructor(parameters: Parameters) : Job
@JvmStatic
fun enqueueIfNecessary() {
if (SignalStore.account.isLinkedDevice && SignalStore.backup.optimizeStorage) {
Log.w(TAG, "Storage optimization is not supported on linked devices. Disabling and restoring all media.")
SignalStore.backup.optimizeStorage = false
}
if (SignalStore.backup.backsUpMedia && !SignalStore.backup.optimizeStorage) {
AppDependencies.jobManager.add(RestoreOptimizedMediaJob())
}