From 9da49f9f8ae9d032696045d2953d71131c426580 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 5 Jan 2021 15:18:19 -0400
Subject: [PATCH] Load correct recipient from thread record.

---
 .../thoughtcrime/securesms/database/RecipientDatabase.java  | 6 +++++-
 .../org/thoughtcrime/securesms/database/ThreadDatabase.java | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
index 37fdee2b67..d8bed10ed4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -1217,7 +1217,11 @@ public class RecipientDatabase extends Database {
   }
 
   static @NonNull RecipientSettings getRecipientSettings(@NonNull Context context, @NonNull Cursor cursor) {
-    long    id                         = CursorUtil.requireLong(cursor, ID);
+    return getRecipientSettings(context, cursor, ID);
+  }
+
+  static @NonNull RecipientSettings getRecipientSettings(@NonNull Context context, @NonNull Cursor cursor, @NonNull String idColumnName) {
+    long    id                         = CursorUtil.requireLong(cursor, idColumnName);
     UUID    uuid                       = UuidUtil.parseOrNull(CursorUtil.requireString(cursor, UUID));
     String  username                   = CursorUtil.requireString(cursor, USERNAME);
     String  e164                       = CursorUtil.requireString(cursor, PHONE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index a7f2aeb15b..036a71ee7f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -1418,7 +1418,7 @@ public class ThreadDatabase extends Database {
 
     public ThreadRecord getCurrent() {
       RecipientId       recipientId       = RecipientId.from(CursorUtil.requireLong(cursor, ThreadDatabase.RECIPIENT_ID));
-      RecipientSettings recipientSettings = RecipientDatabase.getRecipientSettings(context, cursor);
+      RecipientSettings recipientSettings = RecipientDatabase.getRecipientSettings(context, cursor, ThreadDatabase.RECIPIENT_ID);
 
       Recipient recipient;