From d026498a8c04bfee873c59141a5410256deb5290 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 2 Oct 2019 10:03:43 -0400
Subject: [PATCH] Use recipientId's in SearchRepository.

---
 .../securesms/search/SearchRepository.java            | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/search/SearchRepository.java b/src/org/thoughtcrime/securesms/search/SearchRepository.java
index 8bebb038b7..90c7591967 100644
--- a/src/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/src/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -130,7 +130,7 @@ public class SearchRepository {
     Cursor      systemContacts     = contactRepository.queryNonSignalContacts(query);
     MergeCursor contacts           = new MergeCursor(new Cursor[]{ textSecureContacts, systemContacts });
 
-    return new CursorList<>(contacts, new RecipientModelBuilder(context));
+    return new CursorList<>(contacts, new RecipientModelBuilder());
   }
 
   private CursorList<ThreadRecord> queryConversations(@NonNull String query) {
@@ -178,15 +178,10 @@ public class SearchRepository {
 
   private static class RecipientModelBuilder implements CursorList.ModelBuilder<Recipient> {
 
-    private final Context context;
-
-    RecipientModelBuilder(@NonNull Context context) {
-      this.context = context;
-    }
-
     @Override
     public Recipient build(@NonNull Cursor cursor) {
-      return Recipient.external(context, cursor.getString(1));
+      long recipientId = cursor.getLong(cursor.getColumnIndexOrThrow(ContactRepository.ID_COLUMN));
+      return Recipient.resolved(RecipientId.from(recipientId));
     }
   }