TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-25 18:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on conversation list search

Browse Source 
Fixes #6936
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-09-07 13:52:25 -07:00
parent 962fb60ffb
commit 032eaa4389
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/thoughtcrime/securesms/database/ThreadDatabase.java
View File

@ -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) if (filter == null || filter.size() == 0)
return null; return null;
@ -316,18 +316,27 @@ public class ThreadDatabase extends Database {
List<Cursor> cursors = new LinkedList<>(); List<Cursor> cursors = new LinkedList<>();
for (List<Address> addresses : partitionedAddresses) { for (List<Address> addresses : partitionedAddresses) {
String selection = ADDRESS + " = ?"; String selection = TABLE_NAME + "." + ADDRESS + " = ?";
String[] selectionArgs = new String[addresses.size()]; String[] selectionArgs = new String[addresses.size()];
for (int i=0;i<addresses.size()-1;i++) for (int i=0;i<addresses.size()-1;i++)
selection += (" OR " + ADDRESS + " = ?"); selection += (" OR " + TABLE_NAME + "." + ADDRESS + " = ?");
int i= 0; int i= 0;
for (Address address : addresses) { for (Address address : addresses) {
selectionArgs[i++] = DelimiterUtil.escape(address.serialize(), ' '); 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); Cursor cursor = cursors.size() > 1 ? new MergeCursor(cursors.toArray(new Cursor[cursors.size()])) : cursors.get(0);