Basic search

app/src/main/java/eu/faircode/email/ActivityView.java

@@ -654,10 +654,11 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
                     db.beginTransaction();
 
                     EntityMessage message = db.message().getMessage(id);
-                    for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
-                        db.message().setMessageUiSeen(tmessage.id, true);
-                        EntityOperation.queue(db, tmessage, EntityOperation.SEEN, true);
-                    }
+                    if (message != null) // Searched messages are not stored in the database
+                        for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
+                            db.message().setMessageUiSeen(tmessage.id, true);
+                            EntityOperation.queue(db, tmessage, EntityOperation.SEEN, true);
+                        }
 
                     db.setTransactionSuccessful();
                 } finally {

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -52,7 +52,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
     private boolean debug;
     private DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.SHORT, SimpleDateFormat.LONG);
 
-    enum ViewType {UNIFIED, FOLDER, THREAD}
+    enum ViewType {UNIFIED, FOLDER, THREAD, SEARCH}
 
     public class ViewHolder extends RecyclerView.ViewHolder
             implements View.OnClickListener, View.OnLongClickListener {

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -35,17 +36,35 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.sun.mail.imap.IMAPFolder;
+import com.sun.mail.imap.IMAPStore;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
+
+import javax.mail.FetchProfile;
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.UIDFolder;
+import javax.mail.internet.MimeMessage;
+import javax.mail.search.BodyTerm;
+import javax.mail.search.OrTerm;
+import javax.mail.search.SubjectTerm;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SearchView;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
+import androidx.paging.DataSource;
 import androidx.paging.LivePagedListBuilder;
 import androidx.paging.PagedList;
+import androidx.paging.PositionalDataSource;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -56,20 +75,31 @@ public class FragmentMessages extends FragmentEx {
     private Group grpReady;
     private FloatingActionButton fab;
 
+    private long folder = -1;
+    private long thread = -1;
+    private String search = null;
     private long primary = -1;
     private AdapterMessage adapter;
 
     private static final int PAGE_SIZE = 50;
 
     @Override
-    @Nullable
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_messages, container, false);
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
         // Get arguments
         Bundle args = getArguments();
-        long folder = (args == null ? -1 : args.getLong("folder", -1));
-        long thread = (args == null ? -1 : args.getLong("thread", -1)); // message ID
+        if (args != null) {
+            folder = args.getLong("folder", -1);
+            thread = args.getLong("thread", -1); // message ID
+            search = args.getString("search");
+        }
+    }
+
+    @Override
+    @Nullable
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_messages, container, false);
 
         setHasOptionsMenu(true);
 
@@ -87,13 +117,16 @@ public class FragmentMessages extends FragmentEx {
         rvMessage.setLayoutManager(llm);
 
         AdapterMessage.ViewType viewType;
-        if (thread < 0)
-            if (folder < 0)
-                viewType = AdapterMessage.ViewType.UNIFIED;
+        if (TextUtils.isEmpty(search))
+            if (thread < 0)
+                if (folder < 0)
+                    viewType = AdapterMessage.ViewType.UNIFIED;
+                else
+                    viewType = AdapterMessage.ViewType.FOLDER;
             else
-                viewType = AdapterMessage.ViewType.FOLDER;
+                viewType = AdapterMessage.ViewType.THREAD;
         else
-            viewType = AdapterMessage.ViewType.THREAD;
+            viewType = AdapterMessage.ViewType.SEARCH;
 
         adapter = new AdapterMessage(getContext(), getViewLifecycleOwner(), viewType);
         rvMessage.setAdapter(adapter);
@@ -121,12 +154,7 @@ public class FragmentMessages extends FragmentEx {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        // Get arguments
-        Bundle args = getArguments();
-        long folder = (args == null ? -1 : args.getLong("folder", -1));
-        long thread = (args == null ? -1 : args.getLong("thread", -1)); // message ID
-
-        DB db = DB.getInstance(getContext());
+        final DB db = DB.getInstance(getContext());
 
         db.account().livePrimaryAccount().observe(getViewLifecycleOwner(), new Observer<EntityAccount>() {
             @Override
@@ -136,48 +164,171 @@ public class FragmentMessages extends FragmentEx {
             }
         });
 
-        // Observe folder/messages
+        // Observe folder/messages/search
         LiveData<PagedList<TupleMessageEx>> messages;
-        boolean debug = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("debug", false);
-        if (thread < 0)
-            if (folder < 0) {
-                db.folder().liveUnified().observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {
-                    @Override
-                    public void onChanged(List<TupleFolderEx> folders) {
-                        int unseen = 0;
-                        if (folders != null)
-                            for (TupleFolderEx folder : folders)
-                                unseen += folder.unseen;
-                        String name = getString(R.string.title_folder_unified);
-                        if (unseen > 0)
-                            setSubtitle(getString(R.string.title_folder_unseen, name, unseen));
-                        else
-                            setSubtitle(name);
-                    }
-                });
-
-                messages = new LivePagedListBuilder<>(db.message().pagedUnifiedInbox(debug), PAGE_SIZE).build();
-            } else {
-                db.folder().liveFolderEx(folder).observe(getViewLifecycleOwner(), new Observer<TupleFolderEx>() {
-                    @Override
-                    public void onChanged(@Nullable TupleFolderEx folder) {
-                        if (folder == null)
-                            setSubtitle(null);
-                        else {
-                            String name = Helper.localizeFolderName(getContext(), folder.name);
-                            if (folder.unseen > 0)
-                                setSubtitle(getString(R.string.title_folder_unseen, name, folder.unseen));
+        if (TextUtils.isEmpty(search)) {
+            boolean debug = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("debug", false);
+            if (thread < 0)
+                if (folder < 0) {
+                    db.folder().liveUnified().observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {
+                        @Override
+                        public void onChanged(List<TupleFolderEx> folders) {
+                            int unseen = 0;
+                            if (folders != null)
+                                for (TupleFolderEx folder : folders)
+                                    unseen += folder.unseen;
+                            String name = getString(R.string.title_folder_unified);
+                            if (unseen > 0)
+                                setSubtitle(getString(R.string.title_folder_unseen, name, unseen));
                             else
                                 setSubtitle(name);
                         }
-                    }
-                });
+                    });
+
+                    messages = new LivePagedListBuilder<>(db.message().pagedUnifiedInbox(debug), PAGE_SIZE).build();
+                } else {
+                    db.folder().liveFolderEx(folder).observe(getViewLifecycleOwner(), new Observer<TupleFolderEx>() {
+                        @Override
+                        public void onChanged(@Nullable TupleFolderEx folder) {
+                            if (folder == null)
+                                setSubtitle(null);
+                            else {
+                                String name = Helper.localizeFolderName(getContext(), folder.name);
+                                if (folder.unseen > 0)
+                                    setSubtitle(getString(R.string.title_folder_unseen, name, folder.unseen));
+                                else
+                                    setSubtitle(name);
+                            }
+                        }
+                    });
 
-                messages = new LivePagedListBuilder<>(db.message().pagedFolder(folder, debug), PAGE_SIZE).build();
+                    messages = new LivePagedListBuilder<>(db.message().pagedFolder(folder, debug), PAGE_SIZE).build();
+                }
+            else {
+                setSubtitle(R.string.title_folder_thread);
+                messages = new LivePagedListBuilder<>(db.message().pagedThread(thread, debug), PAGE_SIZE).build();
             }
-        else {
-            setSubtitle(R.string.title_folder_thread);
-            messages = new LivePagedListBuilder<>(db.message().pagedThread(thread, debug), PAGE_SIZE).build();
+        } else {
+            setSubtitle(getString(R.string.title_searching, search));
+
+            DataSource.Factory<Integer, TupleMessageEx> dsf = new DataSource.Factory<Integer, TupleMessageEx>() {
+                @Override
+                public DataSource<Integer, TupleMessageEx> create() {
+                    return new PositionalDataSource<TupleMessageEx>() {
+                        @Override
+                        public void loadInitial(LoadInitialParams params, LoadInitialCallback<TupleMessageEx> callback) {
+                            Log.i(Helper.TAG, "loadInitial(" + params.requestedStartPosition + ", " + params.requestedLoadSize + ")");
+                            callback.onResult(search(search, params.requestedStartPosition, params.requestedLoadSize), params.requestedStartPosition);
+                        }
+
+                        @Override
+                        public void loadRange(LoadRangeParams params, LoadRangeCallback<TupleMessageEx> callback) {
+                            Log.i(Helper.TAG, "loadRange(" + params.startPosition + ", " + params.loadSize + ")");
+                            callback.onResult(search(search, params.startPosition, params.loadSize));
+                        }
+
+                        private List<TupleMessageEx> search(String term, int from, int count) {
+                            List<TupleMessageEx> list = new ArrayList<>();
+                            IMAPStore istore = null;
+                            try {
+                                DB db = DB.getInstance(getContext());
+
+                                EntityFolder f = db.folder().getFolder(folder);
+                                EntityAccount account = db.account().getAccount(f.account);
+
+                                Properties props = MessageHelper.getSessionProperties();
+                                Session isession = Session.getInstance(props, null);
+                                Log.i(Helper.TAG, "Connecting to account=" + account.name);
+                                istore = (IMAPStore) isession.getStore("imaps");
+                                istore.connect(account.host, account.port, account.user, account.password);
+
+                                Log.i(Helper.TAG, "Opening folder=" + f.name);
+                                IMAPFolder ifolder = (IMAPFolder) istore.getFolder(f.name);
+                                ifolder.open(Folder.READ_WRITE);
+
+                                Log.i(Helper.TAG, "Search for term=" + term);
+                                Message[] imessages = ifolder.search(
+                                        new OrTerm(
+                                                new SubjectTerm(term),
+                                                new BodyTerm(term)));
+                                Log.i(Helper.TAG, "Found messages=" + imessages.length);
+
+                                List<Message> selected = new ArrayList<>();
+                                int base = imessages.length - 1 - from;
+                                for (int i = base; i >= 0 && i >= base - count - 1; i--)
+                                    selected.add(imessages[i]);
+                                Log.i(Helper.TAG, "Selected messages=" + selected.size());
+
+                                FetchProfile fp = new FetchProfile();
+                                fp.add(UIDFolder.FetchProfileItem.UID);
+                                fp.add(IMAPFolder.FetchProfileItem.FLAGS);
+                                fp.add(FetchProfile.Item.ENVELOPE);
+                                fp.add(FetchProfile.Item.CONTENT_INFO);
+                                fp.add(IMAPFolder.FetchProfileItem.HEADERS);
+                                fp.add(IMAPFolder.FetchProfileItem.MESSAGE);
+                                ifolder.fetch(selected.toArray(new Message[0]), fp);
+
+                                for (Message imessage : selected) {
+                                    long uid = ifolder.getUID(imessage);
+                                    Log.i(Helper.TAG, "Get uid=" + uid);
+
+                                    MessageHelper helper = new MessageHelper((MimeMessage) imessage);
+                                    boolean seen = helper.getSeen();
+
+                                    TupleMessageEx message = new TupleMessageEx();
+                                    message.id = uid;
+                                    message.account = f.account;
+                                    message.folder = f.id;
+                                    message.uid = uid;
+                                    message.msgid = helper.getMessageID();
+                                    message.references = TextUtils.join(" ", helper.getReferences());
+                                    message.inreplyto = helper.getInReplyTo();
+                                    message.thread = helper.getThreadId(uid);
+                                    message.from = helper.getFrom();
+                                    message.to = helper.getTo();
+                                    message.cc = helper.getCc();
+                                    message.bcc = helper.getBcc();
+                                    message.reply = helper.getReply();
+                                    message.subject = imessage.getSubject();
+                                    message.received = imessage.getReceivedDate().getTime();
+                                    message.sent = (imessage.getSentDate() == null ? null : imessage.getSentDate().getTime());
+                                    message.seen = seen;
+                                    message.ui_seen = seen;
+                                    message.ui_hide = false;
+
+                                    message.accountName = account.name;
+                                    message.folderName = f.name;
+                                    message.folderType = f.type;
+                                    message.count = 1;
+                                    message.unseen = (seen ? 0 : 1);
+                                    message.attachments = 0;
+
+                                    list.add(message);
+                                }
+                            } catch (Throwable ex) {
+                                Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
+                            } finally {
+                                if (istore != null)
+                                    try {
+                                        istore.close();
+                                    } catch (MessagingException ex) {
+                                        Log.w(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
+                                    }
+                            }
+
+                            return list;
+                        }
+
+                    };
+                }
+            };
+
+            PagedList.Config.Builder plcb = new PagedList.Config.Builder()
+                    .setEnablePlaceholders(false)
+                    .setInitialLoadSizeHint(10)
+                    .setPageSize(PAGE_SIZE);
+
+            messages = new LivePagedListBuilder<>(dsf, plcb.build()).build();
         }
 
         messages.observe(getViewLifecycleOwner(), new Observer<PagedList<TupleMessageEx>>() {
@@ -204,11 +355,15 @@ public class FragmentMessages extends FragmentEx {
             }
         });
 
+        Bundle args = new Bundle();
+        args.putLong("folder", folder);
+        args.putLong("thread", thread);
+
         new SimpleTask<Long>() {
             @Override
             protected Long onLoad(Context context, Bundle args) {
-                long folder = (args == null ? -1 : args.getLong("folder", -1));
-                long thread = (args == null ? -1 : args.getLong("thread", -1)); // message ID
+                long folder = args.getLong("folder", -1);
+                long thread = args.getLong("thread", -1); // message ID
 
                 DB db = DB.getInstance(context);
 
@@ -241,17 +396,47 @@ public class FragmentMessages extends FragmentEx {
             protected void onException(Bundle args, Throwable ex) {
                 Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
             }
-        }.load(this, getArguments());
+        }.load(this, args);
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_list, menu);
+
+        // TODO: search hint
+        final MenuItem menuSearch = menu.findItem(R.id.menu_search);
+        final SearchView searchView = (SearchView) menuSearch.getActionView();
+        searchView.setSubmitButtonEnabled(true);
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                menuSearch.collapseActionView();
+
+                Intent intent = new Intent();
+                intent.putExtra("folder", folder);
+                intent.putExtra("search", query);
+
+                FragmentMessages fragment = new FragmentMessages();
+                fragment.setArguments(intent.getExtras());
+                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search");
+                fragmentTransaction.commit();
+
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                return false;
+            }
+        });
+
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
+        menu.findItem(R.id.menu_search).setVisible(folder >= 0);
         menu.findItem(R.id.menu_folders).setVisible(primary >= 0);
         super.onPrepareOptionsMenu(menu);
     }

app/src/main/java/eu/faircode/email/MessageHelper.java

@@ -91,6 +91,12 @@ public class MessageHelper {
         props.put("mail.smtp.writetimeout", "20000"); // one thread overhead
         props.put("mail.smtp.timeout", "20000");
 
+        props.put("mail.imaps.peek", "true");
+        //props.put("mail.imaps.minidletime", "5000");
+
+        props.put("mail.mime.address.strict", "false");
+        props.put("mail.mime.decodetext.strict", "false");
+
         return props;
     }
 

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -386,16 +386,11 @@ public class ServiceSynchronize extends LifecycleService {
         final DB db = DB.getInstance(this);
         final ExecutorService executor = Executors.newSingleThreadExecutor();
 
-        Properties props = MessageHelper.getSessionProperties();
-        props.setProperty("mail.imaps.peek", "true");
-        props.setProperty("mail.mime.address.strict", "false");
-        props.setProperty("mail.mime.decodetext.strict", "false");
-        //props.put("mail.imaps.minidletime", "5000");
-
         boolean debug = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("debug", false);
         if (debug)
             System.setProperty("mail.socket.debug", "true");
 
+        Properties props = MessageHelper.getSessionProperties();
         final Session isession = Session.getInstance(props, null);
         isession.setDebug(debug);
         // adb -t 1 logcat | grep "fairemail\|System.out"

app/src/main/res/drawable/baseline_search_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>

app/src/main/res/menu/menu_list.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_folders"
         android:icon="@drawable/baseline_folder_24"

app/src/main/res/values/strings.xml

@@ -171,6 +171,9 @@
     <string name="title_draft_saved">Draft saved</string>
     <string name="title_queued">Sending message</string>
 
+    <string name="title_search">Search</string>
+    <string name="title_searching">Searching \'%1$s\'</string>
+
     <string name="title_legend_cc">CC/BCC</string>
     <string name="title_legend_attachment">Attachment</string>
     <string name="title_legend_synchronize">Synchronize</string>