Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs for chat folders in storage sync.

Browse Source
This commit is contained in:
Michelle Tang
2025-08-18 11:40:10 -04:00
committed by Jeffrey Starke
parent d636ef8ec9
commit 958dde0f6e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt
View File

@@ -326,6 +326,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
ChatFolderTable.SHOW_MUTED to chatFolder.showMutedChats,
ChatFolderTable.SHOW_INDIVIDUAL to chatFolder.showIndividualChats,
ChatFolderTable.SHOW_GROUPS to chatFolder.showGroupChats,
ChatFolderTable.STORAGE_SERVICE_ID to chatFolder.storageServiceId.let { Base64.encodeWithPadding(chatFolder.storageServiceId!!.raw) },
ChatFolderTable.STORAGE_SERVICE_PROTO to storageServiceProto,
ChatFolderTable.DELETED_TIMESTAMP_MS to chatFolder.deletedTimestampMs
)

2
app/src/main/java/org/thoughtcrime/securesms/storage/ChatFolderRecordProcessor.kt
View File

@@ -75,7 +75,7 @@ class ChatFolderRecordProcessor : DefaultStorageRecordProcessor<SignalChatFolder
*/
override fun merge(remote: SignalChatFolderRecord, local: SignalChatFolderRecord, keyGenerator: StorageKeyGenerator): SignalChatFolderRecord {
return if (remote.proto.deletedAtTimestampMs > 0 && local.proto.deletedAtTimestampMs > 0) {
if (remote.proto.deletedAtTimestampMs < local.proto.deletedAtTimestampMs) {
if (remote.proto.deletedAtTimestampMs <= local.proto.deletedAtTimestampMs) {
remote
} else {
local

2
app/src/main/java/org/thoughtcrime/securesms/storage/NotificationProfileRecordProcessor.kt
View File

@@ -72,7 +72,7 @@ class NotificationProfileRecordProcessor : DefaultStorageRecordProcessor<SignalN
val isLocalDeleted = local.proto.deletedAtTimestampMs > 0
return when {
isRemoteDeleted && isLocalDeleted -> if (remote.proto.deletedAtTimestampMs < local.proto.deletedAtTimestampMs) remote else local
isRemoteDeleted && isLocalDeleted -> if (remote.proto.deletedAtTimestampMs <= local.proto.deletedAtTimestampMs) remote else local
isRemoteDeleted -> remote
isLocalDeleted -> local
else -> remote