From fdc868e7b3ecacf645aac038cc012342ba5af635 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 16 Oct 2018 10:56:05 +0000
Subject: [PATCH] Added spam menu

---
 .../eu/faircode/email/AdapterMessage.java     | 52 +++++++++++++++++--
 app/src/main/res/menu/menu_message.xml        |  3 ++
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 89ddd474..631c4b31 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -796,6 +796,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 @Override
                 public boolean onMenuItemClick(MenuItem target) {
                     switch (target.getItemId()) {
+                        case R.id.menu_junk:
+                            onJunk(data);
+                            return true;
                         case R.id.menu_forward:
                             onForward(data);
                             return true;
@@ -1020,6 +1023,51 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             });
         }
 
+        private void onJunk(final ActionData data) {
+            new DialogBuilderLifecycle(context, owner)
+                    .setMessage(R.string.title_ask_spam)
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            Bundle args = new Bundle();
+                            args.putLong("id", data.message.id);
+
+                            new SimpleTask<Void>() {
+                                @Override
+                                protected Void onLoad(Context context, Bundle args) {
+                                    long id = args.getLong("id");
+
+                                    DB db = DB.getInstance(context);
+                                    try {
+                                        db.beginTransaction();
+
+                                        db.message().setMessageUiHide(id, true);
+
+                                        EntityMessage message = db.message().getMessage(id);
+                                        EntityFolder spam = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
+                                        EntityOperation.queue(db, message, EntityOperation.MOVE, spam.id);
+
+                                        db.setTransactionSuccessful();
+                                    } finally {
+                                        db.endTransaction();
+                                    }
+
+                                    EntityOperation.process(context);
+
+                                    return null;
+                                }
+
+                                @Override
+                                protected void onException(Bundle args, Throwable ex) {
+                                    Helper.unexpectedError(context, ex);
+                                }
+                            }.load(context, owner, args);
+                        }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show();
+        }
+
         private void onDelete(final ActionData data) {
             if (data.delete) {
                 // No trash or is trash
@@ -1141,10 +1189,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                         }
                     });
 
-                    EntityFolder junk = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
-                    if (junk != null && !message.folder.equals(junk.id))
-                        folders.add(0, junk);
-
                     EntityFolder sent = db.folder().getFolderByType(message.account, EntityFolder.SENT);
                     if (sent != null && !message.folder.equals(sent.id))
                         folders.add(0, sent);
diff --git a/app/src/main/res/menu/menu_message.xml b/app/src/main/res/menu/menu_message.xml
index c32bc2ce..8d3820fa 100644
--- a/app/src/main/res/menu/menu_message.xml
+++ b/app/src/main/res/menu/menu_message.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_junk"
+        android:title="@string/title_spam" />
 
     <item
         android:id="@+id/menu_forward"