From 9823563ef7e680b90e6ce986a444e978daa9ecc7 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 22 Jan 2025 16:59:08 -0500
Subject: [PATCH] Fix recipient on some update messages when exporting.

---
 .../backup/v2/exporters/ChatItemArchiveExporter.kt        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
index ba58b0c939..8dd438ffdb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
@@ -432,10 +432,10 @@ private fun BackupMessageRecord.toBasicChatItemBuilder(selfRecipientId: Recipien
 
   // If a user restores a backup with a different number, then they'll have outgoing messages from a non-self contact.
   // We want to ensure all outgoing messages are from ourselves.
-  val fromRecipientId = if (direction == Direction.OUTGOING) {
-    selfRecipientId.toLong()
-  } else {
-    record.fromRecipientId
+  val fromRecipientId = when {
+    direction == Direction.OUTGOING -> selfRecipientId.toLong()
+    direction == Direction.DIRECTIONLESS && MessageTypes.isOutgoingMessageType(record.type) -> selfRecipientId.toLong()
+    else -> record.fromRecipientId
   }
 
   val builder = ChatItem.Builder().apply {