From 032eaa4389d5c91c2d7ac9d27758fdea606888c2 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 7 Sep 2017 13:52:25 -0700
Subject: [PATCH] Fix crash on conversation list search

Fixes #6936
// FREEBIE
---
 .../securesms/database/ThreadDatabase.java      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 5ecda34829..cf157438b4 100644
--- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -307,7 +307,7 @@ public class ThreadDatabase extends Database {
 
   }
 
-  public Cursor getFilteredConversationList(List<Address> filter) {
+  public Cursor getFilteredConversationList(@Nullable List<Address> filter) {
     if (filter == null || filter.size() == 0)
       return null;
 
@@ -316,18 +316,27 @@ public class ThreadDatabase extends Database {
     List<Cursor>        cursors              = new LinkedList<>();
 
     for (List<Address> addresses : partitionedAddresses) {
-      String   selection      = ADDRESS + " = ?";
+      String   selection      = TABLE_NAME + "." + ADDRESS + " = ?";
       String[] selectionArgs  = new String[addresses.size()];
 
       for (int i=0;i<addresses.size()-1;i++)
-        selection += (" OR " + ADDRESS + " = ?");
+        selection += (" OR " + TABLE_NAME + "." + ADDRESS + " = ?");
 
       int i= 0;
       for (Address address : addresses) {
         selectionArgs[i++] = DelimiterUtil.escape(address.serialize(), ' ');
       }
 
-      cursors.add(db.query(TABLE_NAME, null, selection, selectionArgs, null, null, DATE + " DESC"));
+      String         projection = Util.join(COMBINED_THREAD_RECIPIENT_GROUP_PROJECTION, ",");
+      String query = "SELECT " + projection + " FROM " + TABLE_NAME +
+                     " LEFT OUTER JOIN " + RecipientDatabase.TABLE_NAME +
+                     " ON " + TABLE_NAME + "." + ADDRESS + " = " + RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.ADDRESS +
+                     " LEFT OUTER JOIN " + GroupDatabase.TABLE_NAME +
+                     " ON " + TABLE_NAME + "." + ADDRESS + " = " + GroupDatabase.TABLE_NAME + "." + GroupDatabase.GROUP_ID +
+                     " WHERE " + selection +
+                     " ORDER BY " + TABLE_NAME + "." + DATE + " DESC";
+
+      cursors.add(db.rawQuery(query, selectionArgs));
     }
 
     Cursor cursor = cursors.size() > 1 ? new MergeCursor(cursors.toArray(new Cursor[cursors.size()])) : cursors.get(0);