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

Fix chat session refreshed on secondary after link+sync.

Browse Source
This commit is contained in:
Cody Henthorne
2026-07-14 16:27:20 -04:00
committed by Greyson Parrelli
parent e975084b8e
commit 693b208fe2
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
+17 -6
View File
@@ -102,6 +102,7 @@ import org.thoughtcrime.securesms.database.KeyValueDatabase
import org.thoughtcrime.securesms.database.KyberPreKeyTable
import org.thoughtcrime.securesms.database.OneTimePreKeyTable
import org.thoughtcrime.securesms.database.SearchTable
import org.thoughtcrime.securesms.database.SessionTable
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.SignedPreKeyTable
import org.thoughtcrime.securesms.database.StickerTable
@@ -1126,7 +1127,7 @@ object BackupRepository {
}
return frameReader.use { reader ->
import(reader, selfData, cancellationSignal = { false })
import(reader, selfData, backupMode = BackupMode.LOCAL, cancellationSignal = { false })
}
}
@@ -1157,7 +1158,7 @@ object BackupRepository {
}
return frameReader.use { reader ->
import(reader, selfData, cancellationSignal)
import(reader, selfData, backupMode = BackupMode.REMOTE, cancellationSignal = cancellationSignal)
}
} catch (e: IOException) {
Log.w(TAG, "Unable to restore signal backup", e)
@@ -1185,7 +1186,7 @@ object BackupRepository {
)
return frameReader.use { reader ->
import(reader, selfData, cancellationSignal)
import(reader, selfData, backupMode = BackupMode.LINK_SYNC, cancellationSignal = cancellationSignal)
}
}
@@ -1211,7 +1212,7 @@ object BackupRepository {
}
return frameReader.use { reader ->
import(reader, selfData, cancellationSignal)
import(reader, selfData, backupMode = BackupMode.REMOTE, cancellationSignal = cancellationSignal)
}
}
@@ -1227,13 +1228,14 @@ object BackupRepository {
val frameReader = PlainTextBackupReader(inputStreamFactory(), length)
return frameReader.use { reader ->
import(reader, selfData, cancellationSignal)
import(reader, selfData, backupMode = BackupMode.PLAINTEXT_EXPORT, cancellationSignal = cancellationSignal)
}
}
private fun import(
frameReader: BackupImportReader,
selfData: SelfData,
backupMode: BackupMode,
cancellationSignal: () -> Boolean
): ImportResult {
val stopwatch = Stopwatch("import")
@@ -1291,7 +1293,16 @@ object BackupRepository {
}
Log.d(TAG, "[import] --- Recreating all tables ---")
val skipTables = setOf(KyberPreKeyTable.TABLE_NAME, OneTimePreKeyTable.TABLE_NAME, SignedPreKeyTable.TABLE_NAME)
val skipTables = buildSet {
add(KyberPreKeyTable.TABLE_NAME)
add(OneTimePreKeyTable.TABLE_NAME)
add(SignedPreKeyTable.TABLE_NAME)
// Preserve the session established with the primary during linking
if (backupMode.isLinkAndSync) {
add(SessionTable.TABLE_NAME)
}
}
val tableMetadata = SignalDatabase.rawDatabase.getAllTableDefinitions().filter { !it.name.startsWith(SearchTable.FTS_TABLE_NAME + "_") }
for (table in tableMetadata) {
if (skipTables.contains(table.name)) {