From ba184ea3b4a2d0443a69518ecd174346919ca7a3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 16 Mar 2019 18:10:56 +0000
Subject: [PATCH] Added local contacts search

---
 .../eu/faircode/email/AdapterContact.java     | 38 ++++++++++++++----
 .../eu/faircode/email/FragmentContacts.java   | 40 +++++++++++++++++++
 app/src/main/res/menu/menu_contacts.xml       |  7 ++++
 3 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java
index da2bf5e8c6..cd87e11054 100644
--- a/app/src/main/java/eu/faircode/email/AdapterContact.java
+++ b/app/src/main/java/eu/faircode/email/AdapterContact.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -49,7 +50,9 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
     private int colorAccent;
     private int textColorSecondary;
 
-    private List<EntityContact> items = new ArrayList<>();
+    private String search = null;
+    private List<EntityContact> all = new ArrayList<>();
+    private List<EntityContact> selected = new ArrayList<>();
 
     private static NumberFormat nf = NumberFormat.getNumberInstance();
 
@@ -121,7 +124,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
             if (pos == RecyclerView.NO_POSITION)
                 return;
 
-            EntityContact contact = items.get(pos);
+            EntityContact contact = selected.get(pos);
             if (contact.state == EntityContact.STATE_DEFAULT)
                 contact.state = EntityContact.STATE_FAVORITE;
             else
@@ -163,7 +166,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
             if (pos == RecyclerView.NO_POSITION)
                 return false;
 
-            EntityContact contact = items.get(pos);
+            EntityContact contact = selected.get(pos);
 
             Bundle args = new Bundle();
             args.putLong("id", contact.id);
@@ -207,9 +210,23 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
     public void set(@NonNull List<EntityContact> contacts) {
         Log.i("Set contacts=" + contacts.size());
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, contacts), false);
+        all = contacts;
 
-        items = contacts;
+        List<EntityContact> items;
+        if (TextUtils.isEmpty(search))
+            items = all;
+        else {
+            items = new ArrayList<>();
+            String query = search.toLowerCase().trim();
+            for (EntityContact contact : contacts)
+                if (contact.email.toLowerCase().contains(query) ||
+                        (contact.name != null && contact.name.toLowerCase().contains(query)))
+                    items.add(contact);
+        }
+
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(selected, items), false);
+
+        selected = items;
 
         diff.dispatchUpdatesTo(new ListUpdateCallback() {
             @Override
@@ -235,6 +252,11 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
         diff.dispatchUpdatesTo(this);
     }
 
+    public void search(String query) {
+        search = query;
+        set(all);
+    }
+
     private class DiffCallback extends DiffUtil.Callback {
         private List<EntityContact> prev = new ArrayList<>();
         private List<EntityContact> next = new ArrayList<>();
@@ -271,12 +293,12 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
 
     @Override
     public long getItemId(int position) {
-        return items.get(position).id;
+        return selected.get(position).id;
     }
 
     @Override
     public int getItemCount() {
-        return items.size();
+        return selected.size();
     }
 
     @Override
@@ -288,7 +310,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         holder.unwire();
-        EntityContact contact = items.get(position);
+        EntityContact contact = selected.get(position);
         holder.bindTo(contact);
         holder.wire();
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
index c66cbd00eb..6ab28f6545 100644
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -22,6 +22,7 @@ package eu.faircode.email;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -35,6 +36,7 @@ import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SearchView;
 import androidx.constraintlayout.widget.Group;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -45,6 +47,7 @@ public class FragmentContacts extends FragmentBase {
     private ContentLoadingProgressBar pbWait;
     private Group grpReady;
 
+    private String search = null;
     private AdapterContact adapter;
 
     @Override
@@ -80,6 +83,11 @@ public class FragmentContacts extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        if (savedInstanceState != null) {
+            search = savedInstanceState.getString("fair:search");
+            adapter.search(search);
+        }
+
         DB db = DB.getInstance(getContext());
         db.contact().liveContacts().observe(getViewLifecycleOwner(), new Observer<List<EntityContact>>() {
             @Override
@@ -97,9 +105,41 @@ public class FragmentContacts extends FragmentBase {
         Shortcuts.update(getContext(), getViewLifecycleOwner());
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString("fair:search", search);
+    }
+
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_contacts, menu);
+
+        MenuItem menuSearch = menu.findItem(R.id.menu_search);
+        SearchView searchView = (SearchView) menuSearch.getActionView();
+
+        if (!TextUtils.isEmpty(search)) {
+            menuSearch.expandActionView();
+            searchView.setQuery(search, true);
+            searchView.clearFocus();
+        }
+
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                search = query;
+                adapter.search(query);
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                search = newText;
+                adapter.search(newText);
+                return true;
+            }
+        });
+
         super.onCreateOptionsMenu(menu, inflater);
     }
 
diff --git a/app/src/main/res/menu/menu_contacts.xml b/app/src/main/res/menu/menu_contacts.xml
index 4a5716ff02..e00a338844 100644
--- a/app/src/main/res/menu/menu_contacts.xml
+++ b/app/src/main/res/menu/menu_contacts.xml
@@ -2,6 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_search"
+        android:icon="@drawable/baseline_search_24"
+        android:title="@string/title_search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="collapseActionView|always" />
+
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/baseline_delete_24"