empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix chat and chat item import null instead of 0 bugs.

Browse source
This commit is contained in:
Cody Henthorne 2025-01-17 14:34:57 -05:00 • committed by Greyson Parrelli
parent e91a86c939
commit e370d40560
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt
View file

@ -43,7 +43,7 @@ object ChatArchiveImporter {
.insertInto(ThreadTable.TABLE_NAME) .insertInto(ThreadTable.TABLE_NAME)
.values( .values(
ThreadTable.RECIPIENT_ID to recipientId.serialize(), ThreadTable.RECIPIENT_ID to recipientId.serialize(),
ThreadTable.PINNED to chat.pinnedOrder, ThreadTable.PINNED to (chat.pinnedOrder ?: 0),
ThreadTable.ARCHIVED to chat.archived.toInt(), ThreadTable.ARCHIVED to chat.archived.toInt(),
ThreadTable.READ to if (chat.markedUnread) ThreadTable.ReadStatus.FORCED_UNREAD.serialize() else ThreadTable.ReadStatus.READ.serialize(), ThreadTable.READ to if (chat.markedUnread) ThreadTable.ReadStatus.FORCED_UNREAD.serialize() else ThreadTable.ReadStatus.READ.serialize(),
ThreadTable.ACTIVE to 1 ThreadTable.ACTIVE to 1

1
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
View file

@ -519,6 +519,7 @@ class ChatItemArchiveImporter(
contentValues.put(MessageTable.QUOTE_TYPE, 0) contentValues.put(MessageTable.QUOTE_TYPE, 0)
contentValues.put(MessageTable.VIEW_ONCE, 0) contentValues.put(MessageTable.VIEW_ONCE, 0)
contentValues.put(MessageTable.REMOTE_DELETED, 0) contentValues.put(MessageTable.REMOTE_DELETED, 0)
contentValues.put(MessageTable.PARENT_STORY_ID, 0)
when { when {
this.standardMessage != null -> contentValues.addStandardMessage(this.standardMessage) this.standardMessage != null -> contentValues.addStandardMessage(this.standardMessage)