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

Add null check to pin message import.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-04-09 22:07:27 -04:00
committed by jeffrey-signal
parent bef4bb40ca
commit bd89c7fc39
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
+5 -2
View File
@@ -362,12 +362,13 @@ class ChatItemArchiveImporter(
} else if (pinMessage != null) { } else if (pinMessage != null) {
followUps += { pinUpdateMessageId -> followUps += { pinUpdateMessageId ->
val targetAuthorId = importState.remoteToLocalRecipientId[pinMessage.authorId] val targetAuthorId = importState.remoteToLocalRecipientId[pinMessage.authorId]
if (targetAuthorId != null) { val targetAuthorAci = targetAuthorId?.let { recipients.getRecord(it).aci }
if (targetAuthorId != null && targetAuthorAci != null) {
val pinnedMessageId = SignalDatabase.messages.getMessageFor(pinMessage.targetSentTimestamp, targetAuthorId)?.id ?: -1 val pinnedMessageId = SignalDatabase.messages.getMessageFor(pinMessage.targetSentTimestamp, targetAuthorId)?.id ?: -1
val messageExtras = MessageExtras( val messageExtras = MessageExtras(
pinnedMessage = PinnedMessage( pinnedMessage = PinnedMessage(
pinnedMessageId = pinnedMessageId, pinnedMessageId = pinnedMessageId,
targetAuthorAci = recipients.getRecord(targetAuthorId).aci!!.toByteString(), targetAuthorAci = targetAuthorAci.toByteString(),
targetTimestamp = pinMessage.targetSentTimestamp targetTimestamp = pinMessage.targetSentTimestamp
) )
) )
@@ -383,6 +384,8 @@ class ChatItemArchiveImporter(
.where("${MessageTable.ID} = ?", pinnedMessageId) .where("${MessageTable.ID} = ?", pinnedMessageId)
.run() .run()
} }
} else {
Log.w(TAG, "Pin message target author not found or has no ACI, skipping pin message extras.")
} }
} }
} }