empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Improve the ordering of conversation search results.

Browse source
This commit is contained in:
Greyson Parrelli 2022-08-25 12:15:02 -04:00
parent cdad45096b
commit 497b38ddbf
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
View file

@ -602,7 +602,7 @@ public class ThreadDatabase extends Database {
selectionArgs[i++] = recipientId.serialize();
}
String query = createQuery(selection, 0);
String query = createQuery(selection, DATE + " DESC", 0, 0);
cursors.add(db.rawQuery(query, selectionArgs));
}

33
app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
View file

@ -35,8 +35,12 @@ import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@ -159,33 +163,46 @@ public class SearchRepository {
return Collections.emptyList();
}
Set<RecipientId> recipientIds = new LinkedHashSet<>();
Set<RecipientId> filteredContacts = new LinkedHashSet<>();
try (Cursor cursor = SignalDatabase.recipients().queryAllContacts(query)) {
while (cursor != null && cursor.moveToNext()) {
filteredContacts.add(RecipientId.from(CursorUtil.requireString(cursor, RecipientDatabase.ID)));
}
}
recipientIds.addAll(filteredContacts);
Set<RecipientId> contactIds = new LinkedHashSet<>(filteredContacts);
if (noteToSelfTitle.toLowerCase().contains(query.toLowerCase())) {
contactIds.add(Recipient.self().getId());
}
Set<RecipientId> groupsByTitleIds = new LinkedHashSet<>();
GroupDatabase.GroupRecord record;
try (GroupDatabase.Reader reader = SignalDatabase.groups().queryGroupsByTitle(query, true, false, false)) {
while ((record = reader.getNext()) != null) {
recipientIds.add(record.getRecipientId());
groupsByTitleIds.add(record.getRecipientId());
}
}
Set<RecipientId> groupsByMemberIds = new LinkedHashSet<>();
try (GroupDatabase.Reader reader = SignalDatabase.groups().queryGroupsByMembership(filteredContacts, true, false, false)) {
while ((record = reader.getNext()) != null) {
recipientIds.add(record.getRecipientId());
groupsByMemberIds.add(record.getRecipientId());
}
}
if (noteToSelfTitle.toLowerCase().contains(query.toLowerCase())) {
recipientIds.add(Recipient.self().getId());
}
List<ThreadRecord> output = new ArrayList<>(contactIds.size() + groupsByTitleIds.size() + groupsByMemberIds.size());
output.addAll(getMatchingThreads(contactIds));
output.addAll(getMatchingThreads(groupsByTitleIds));
output.addAll(getMatchingThreads(groupsByMemberIds));
return output;
}
private List<ThreadRecord> getMatchingThreads(@NonNull Collection<RecipientId> recipientIds) {
try (Cursor cursor = threadDatabase.getFilteredConversationList(new ArrayList<>(recipientIds))) {
return readToList(cursor, new ThreadModelBuilder(threadDatabase));
}