diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java b/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java index 2ffddfde5..1ac055432 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java @@ -37,7 +37,7 @@ public class DcContactsLoader extends AsyncLoader { DcContext dcContext = DcHelper.getContext(getContext()); if (blockedContacts) { int[] blocked_ids = dcContext.getBlockedContacts(); - return new DcContactsLoader.Ret(blocked_ids, query); + return new DcContactsLoader.Ret(blocked_ids); } int[] contact_ids = dcContext.getContacts(listflags, query); @@ -58,16 +58,14 @@ public class DcContactsLoader extends AsyncLoader { int all_ids[] = new int[contact_ids.length + additional_items.length]; System.arraycopy(additional_items, 0, all_ids, 0, additional_items.length); System.arraycopy(contact_ids, 0, all_ids, additional_items.length, contact_ids.length); - return new DcContactsLoader.Ret(all_ids, query); + return new DcContactsLoader.Ret(all_ids); } public class Ret { public final int[] ids; - public final String query; - Ret(int[] ids, String query) { + Ret(int[] ids) { this.ids = ids; - this.query = query; } } } diff --git a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java index 44db7cebb..b6d551130 100644 --- a/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java +++ b/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java @@ -58,7 +58,6 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter private final @NonNull Context context; private final @NonNull DcContext dcContext; private @NonNull int[] dcContactList = new int[0]; - private String query; private final boolean multiSelect; private final boolean longPressSelect; private final LayoutInflater li; @@ -318,7 +317,6 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter public void changeData(DcContactsLoader.Ret loaderRet) { this.dcContactList = loaderRet==null? new int[0] : loaderRet.ids; - this.query = loaderRet==null? null : loaderRet.query; recordCache.clear(); notifyDataSetChanged(); }