From e370d40560f6946b085912d9de20b4fec0788366 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 17 Jan 2025 14:34:57 -0500 Subject: [PATCH] Fix chat and chat item import null instead of 0 bugs. --- .../securesms/backup/v2/importer/ChatArchiveImporter.kt | 2 +- .../securesms/backup/v2/importer/ChatItemArchiveImporter.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt index 70a3b61840..35d332ac35 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatArchiveImporter.kt @@ -43,7 +43,7 @@ object ChatArchiveImporter { .insertInto(ThreadTable.TABLE_NAME) .values( ThreadTable.RECIPIENT_ID to recipientId.serialize(), - ThreadTable.PINNED to chat.pinnedOrder, + ThreadTable.PINNED to (chat.pinnedOrder ?: 0), ThreadTable.ARCHIVED to chat.archived.toInt(), ThreadTable.READ to if (chat.markedUnread) ThreadTable.ReadStatus.FORCED_UNREAD.serialize() else ThreadTable.ReadStatus.READ.serialize(), ThreadTable.ACTIVE to 1 diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt index 8bdba6d8e6..58a29dd1bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt @@ -519,6 +519,7 @@ class ChatItemArchiveImporter( contentValues.put(MessageTable.QUOTE_TYPE, 0) contentValues.put(MessageTable.VIEW_ONCE, 0) contentValues.put(MessageTable.REMOTE_DELETED, 0) + contentValues.put(MessageTable.PARENT_STORY_ID, 0) when { this.standardMessage != null -> contentValues.addStandardMessage(this.standardMessage)