Added menu to mark read/unread, star/unstar

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

@@ -26,6 +26,8 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -39,6 +41,7 @@ import java.util.Date;
 import java.util.List;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.Observer;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -70,6 +73,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         TextView tvError;
         ProgressBar pbLoading;
 
+        private static final int action_seen = 1;
+        private static final int action_flag = 2;
+
         ViewHolder(View itemView) {
             super(itemView);
 
@@ -207,40 +213,59 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             if (pos == RecyclerView.NO_POSITION)
                 return false;
 
-            TupleMessageEx message = getItem(pos);
+            final TupleMessageEx message = getItem(pos);
-
-            Bundle args = new Bundle();
-            args.putLong("id", message.id);
 
-            new SimpleTask<Void>() {
+            PopupMenu popupMenu = new PopupMenu(context, itemView);
+            popupMenu.getMenu().add(Menu.NONE, action_flag, 1, message.ui_flagged ? R.string.title_unflag : R.string.title_flag);
+            popupMenu.getMenu().add(Menu.NONE, action_seen, 2, message.ui_seen ? R.string.title_unseen : R.string.title_seen);
+            popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
-                protected Void onLoad(Context context, Bundle args) {
+                public boolean onMenuItemClick(MenuItem target) {
-                    long id = args.getLong("id");
+                    Bundle args = new Bundle();
-                    DB db = DB.getInstance(context);
+                    args.putLong("id", message.id);
-                    try {
+                    args.putInt("action", target.getItemId());
-                        db.beginTransaction();
+
-
+                    new SimpleTask<Void>() {
-                        EntityMessage message = db.message().getMessage(id);
+                        @Override
-                        for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread)) {
+                        protected Void onLoad(Context context, Bundle args) {
-                            db.message().setMessageUiSeen(tmessage.id, !message.ui_seen);
+                            long id = args.getLong("id");
-                            EntityOperation.queue(db, tmessage, EntityOperation.SEEN, !tmessage.ui_seen);
+                            int action = args.getInt("action");
+
+                            DB db = DB.getInstance(context);
+                            try {
+                                db.beginTransaction();
+
+                                EntityMessage message = db.message().getMessage(id);
+                                for (EntityMessage tmessage : db.message().getMessageByThread(message.account, message.thread))
+                                    if (action == action_flag) {
+                                        db.message().setMessageUiFlagged(tmessage.id, !message.ui_flagged);
+                                        EntityOperation.queue(db, tmessage, EntityOperation.FLAG, !tmessage.ui_flagged);
+                                    } else if (action == action_seen) {
+                                        db.message().setMessageUiSeen(tmessage.id, !message.ui_seen);
+                                        EntityOperation.queue(db, tmessage, EntityOperation.SEEN, !tmessage.ui_seen);
+                                    }
+
+                                db.setTransactionSuccessful();
+                            } finally {
+                                db.endTransaction();
+                            }
+
+                            EntityOperation.process(context);
+
+                            return null;
                         }
 
-                        db.setTransactionSuccessful();
+                        @Override
-                    } finally {
+                        public void onException(Bundle args, Throwable ex) {
-                        db.endTransaction();
+                            Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
-                    }
+                        }
-
+                    }.load(context, owner, args);
-                    EntityOperation.process(context);
 
-                    return null;
+                    return true;
                 }
+            });
 
-                @Override
+            popupMenu.show();
-                public void onException(Bundle args, Throwable ex) {
-                    Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
-                }
-            }.load(context, owner, args);
 
             return true;
         }

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-ar-rBH/strings.xml

@@ -142,6 +142,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-ar-rEG/strings.xml

@@ -142,6 +142,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-ar-rSA/strings.xml

@@ -142,6 +142,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-ar-rYE/strings.xml

@@ -142,6 +142,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -142,6 +142,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -134,6 +134,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Markér som læst</string>
   <string name="title_unseen">Markér som ulæst</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Videresend</string>
   <string name="title_reply_all">Svar alle</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Unterhaltung anzeigen</string>
   <string name="title_seen">Als gelesen markieren</string>
   <string name="title_unseen">Als ungelesen markieren</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Weiterleiten</string>
   <string name="title_reply_all">Antworten an alle</string>
   <string name="title_show_headers">Kopfzeile anzeigen</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-es-rES/strings.xml

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Afficher le fil de discussion</string>
   <string name="title_seen">Marquer comme lu</string>
   <string name="title_unseen">Marquer comme non lu</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Transférer</string>
   <string name="title_reply_all">Répondre à tous</string>
   <string name="title_show_headers">Afficher les en-têtes</string>

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

@@ -134,6 +134,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Segna come letto</string>
   <string name="title_unseen">Segna come non letto</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Inoltra</string>
   <string name="title_reply_all">Rispondi a tutti</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -134,6 +134,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -122,6 +122,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -122,6 +122,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -134,6 +134,8 @@
   <string name="title_thread">Pokaż konwersację</string>
   <string name="title_seen">Oznacz jako przeczytane</string>
   <string name="title_unseen">Oznacz jako nieprzeczytane</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Prześlij dalej</string>
   <string name="title_reply_all">Odpowiedz wszystkim</string>
   <string name="title_show_headers">Pokaż nagłówki</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Encaminhar</string>
   <string name="title_reply_all">Responder a todos</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -130,6 +130,8 @@
   <string name="title_thread">Arată conversație</string>
   <string name="title_seen">Marchează ca Citit</string>
   <string name="title_unseen">Marcare ca necitit</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Redirecționează</string>
   <string name="title_reply_all">Răspunde tuturor</string>
   <string name="title_show_headers">Arată antetul</string>

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

@@ -134,6 +134,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -130,6 +130,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -126,6 +126,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Okundu olarak işaretle</string>
   <string name="title_unseen">Okunmadı olarak işaretle</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">İlet</string>
   <string name="title_reply_all">Tümünü yanıtla</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -134,6 +134,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -122,6 +122,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -122,6 +122,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">标记为已读</string>
   <string name="title_unseen">标记为未读</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">转发</string>
   <string name="title_reply_all">回复全部</string>
   <string name="title_show_headers">Show headers</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -122,6 +122,8 @@
   <string name="title_thread">Show conversation</string>
   <string name="title_seen">Mark read</string>
   <string name="title_unseen">Mark unread</string>
+  <string name="title_flag">Add star</string>
+  <string name="title_unflag">Remove star</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_show_headers">Show headers</string>

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

@@ -147,6 +147,8 @@
     <string name="title_thread">Show conversation</string>
     <string name="title_seen">Mark read</string>
     <string name="title_unseen">Mark unread</string>
+    <string name="title_flag">Add star</string>
+    <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>