From 4cfba86cb1e895e5b8c4f4a9ed54cb82aa21ce0f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 16 Feb 2023 14:37:38 -0500
Subject: [PATCH] Fix bug where username wasn't synced to ContactRecord.

---
 .../securesms/storage/StorageSyncHelper.java           | 10 +++++-----
 .../securesms/storage/StorageSyncModels.java           |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
index a8e939b6b..c888d7595 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -105,11 +105,11 @@ public final class StorageSyncHelper {
   }
 
   public static SignalStorageRecord buildAccountRecord(@NonNull Context context, @NonNull Recipient self) {
-    RecipientTable  recipientTable = SignalDatabase.recipients();
-    RecipientRecord record         = recipientTable.getRecordForSync(self.getId());
-    List<RecipientRecord> pinned            = Stream.of(SignalDatabase.threads().getPinnedRecipientIds())
-                                                    .map(recipientTable::getRecordForSync)
-                                                    .toList();
+    RecipientTable        recipientTable = SignalDatabase.recipients();
+    RecipientRecord       record         = recipientTable.getRecordForSync(self.getId());
+    List<RecipientRecord> pinned         = Stream.of(SignalDatabase.threads().getPinnedRecipientIds())
+                                                 .map(recipientTable::getRecordForSync)
+                                                 .toList();
 
     final OptionalBool storyViewReceiptsState = SignalStore.storyValues().getViewedReceiptsEnabled() ? OptionalBool.ENABLED
                                                                                                      : OptionalBool.DISABLED;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
index 03e36a938..09617f48b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
@@ -127,6 +127,7 @@ public final class StorageSyncModels {
                                   .setHideStory(hideStory)
                                   .setUnregisteredTimestamp(recipient.getSyncExtras().getUnregisteredTimestamp())
                                   .setHidden(recipient.isHidden())
+                                  .setUsername(recipient.getUsername())
                                   .build();
   }