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

Only search for visible parts of a contact.

Browse source
This commit is contained in:
Greyson Parrelli 2020-04-27 14:09:16 -04:00
parent 358d6333c3
commit e0502c24e1
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View file

@ -1281,7 +1281,7 @@ public class RecipientDatabase extends Database {
String selection = BLOCKED + " = ? AND " + String selection = BLOCKED + " = ? AND " +
REGISTERED + " = ? AND " + REGISTERED + " = ? AND " +
GROUP_ID + " IS NULL AND " + GROUP_ID + " IS NULL AND " +
"(" + SYSTEM_DISPLAY_NAME + " NOT NULL OR " + SEARCH_PROFILE_NAME + " NOT NULL OR " + USERNAME + " NOT NULL)"; "(" + SORT_NAME + " NOT NULL OR " + USERNAME + " NOT NULL)";
String[] args = new String[] { "0", String.valueOf(RegisteredState.REGISTERED.getId()) }; String[] args = new String[] { "0", String.valueOf(RegisteredState.REGISTERED.getId()) };
String orderBy = SORT_NAME + ", " + SYSTEM_DISPLAY_NAME + ", " + SEARCH_PROFILE_NAME + ", " + USERNAME + ", " + PHONE; String orderBy = SORT_NAME + ", " + SYSTEM_DISPLAY_NAME + ", " + SEARCH_PROFILE_NAME + ", " + USERNAME + ", " + PHONE;
@ -1292,16 +1292,15 @@ public class RecipientDatabase extends Database {
query = TextUtils.isEmpty(query) ? "*" : query; query = TextUtils.isEmpty(query) ? "*" : query;
query = "%" + query + "%"; query = "%" + query + "%";
String selection = BLOCKED + " = ? AND " + String selection = BLOCKED + " = ? AND " +
REGISTERED + " = ? AND " + REGISTERED + " = ? AND " +
GROUP_ID + " IS NULL AND " + GROUP_ID + " IS NULL AND " +
"(" + "(" +
PHONE + " LIKE ? OR " + PHONE + " LIKE ? OR " +
SYSTEM_DISPLAY_NAME + " LIKE ? OR " + SORT_NAME + " LIKE ? OR " +
SEARCH_PROFILE_NAME + " LIKE ? OR " + USERNAME + " LIKE ?" +
USERNAME + " LIKE ?" +
")"; ")";
String[] args = new String[] { "0", String.valueOf(RegisteredState.REGISTERED.getId()), query, query, query, query }; String[] args = new String[] { "0", String.valueOf(RegisteredState.REGISTERED.getId()), query, query, query };
String orderBy = SORT_NAME + ", " + SYSTEM_DISPLAY_NAME + ", " + SEARCH_PROFILE_NAME + ", " + PHONE; String orderBy = SORT_NAME + ", " + SYSTEM_DISPLAY_NAME + ", " + SEARCH_PROFILE_NAME + ", " + PHONE;
return databaseHelper.getReadableDatabase().query(TABLE_NAME, SEARCH_PROJECTION, selection, args, null, null, orderBy); return databaseHelper.getReadableDatabase().query(TABLE_NAME, SEARCH_PROJECTION, selection, args, null, null, orderBy);
@ -1345,10 +1344,10 @@ public class RecipientDatabase extends Database {
String selection = BLOCKED + " = ? AND " + String selection = BLOCKED + " = ? AND " +
"(" + "(" +
SYSTEM_DISPLAY_NAME + " LIKE ? OR " + SORT_NAME + " LIKE ? OR " +
SEARCH_PROFILE_NAME + " LIKE ? OR " + USERNAME + " LIKE ? OR " +
PHONE + " LIKE ? OR " + PHONE + " LIKE ? OR " +
EMAIL + " LIKE ?" + EMAIL + " LIKE ?" +
")"; ")";
String[] args = new String[] { "0", query, query, query, query }; String[] args = new String[] { "0", query, query, query, query };
@ -1357,9 +1356,9 @@ public class RecipientDatabase extends Database {
public @NonNull List<Recipient> getRecipientsForMultiDeviceSync() { public @NonNull List<Recipient> getRecipientsForMultiDeviceSync() {
String subquery = "SELECT " + ThreadDatabase.TABLE_NAME + "." + ThreadDatabase.RECIPIENT_ID + " FROM " + ThreadDatabase.TABLE_NAME; String subquery = "SELECT " + ThreadDatabase.TABLE_NAME + "." + ThreadDatabase.RECIPIENT_ID + " FROM " + ThreadDatabase.TABLE_NAME;
String selection = REGISTERED + " = ? AND " + String selection = REGISTERED + " = ? AND " +
GROUP_ID + " IS NULL AND " + GROUP_ID + " IS NULL AND " +
ID + " != ? AND " + ID + " != ? AND " +
"(" + SYSTEM_DISPLAY_NAME + " NOT NULL OR " + ID + " IN (" + subquery + "))"; "(" + SYSTEM_DISPLAY_NAME + " NOT NULL OR " + ID + " IN (" + subquery + "))";
String[] args = new String[] { String.valueOf(RegisteredState.REGISTERED.getId()), Recipient.self().getId().serialize() }; String[] args = new String[] { String.valueOf(RegisteredState.REGISTERED.getId()), Recipient.self().getId().serialize() };