From e1e2334517e2d2ec9759180606a374f534483cb8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 21 Sep 2019 15:43:59 +0200
Subject: [PATCH] Allow rule to be executed after check

---
 .../java/eu/faircode/email/FragmentRule.java  | 65 +++++++++++++++++--
 app/src/main/res/layout/dialog_rule_match.xml | 16 ++++-
 2 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index ef09febc68..bf318e9d64 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -48,6 +48,7 @@ import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TimePicker;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -749,6 +750,7 @@ public class FragmentRule extends FragmentBase {
     private void onActionCheck() {
         try {
             JSONObject jcondition = getCondition();
+            JSONObject jaction = getAction();
 
             JSONObject jheader = jcondition.optJSONObject("header");
             if (jheader != null) {
@@ -759,6 +761,7 @@ public class FragmentRule extends FragmentBase {
             Bundle args = new Bundle();
             args.putLong("folder", folder);
             args.putString("condition", jcondition.toString());
+            args.putString("action", jaction.toString());
 
             FragmentDialogCheck fragment = new FragmentDialogCheck();
             fragment.setArguments(args);
@@ -1033,10 +1036,12 @@ public class FragmentRule extends FragmentBase {
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             long folder = getArguments().getLong("folder");
             String condition = getArguments().getString("condition");
+            String action = getArguments().getString("action");
 
             final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_rule_match, null);
             final TextView tvNoMessages = dview.findViewById(R.id.tvNoMessages);
             final RecyclerView rvMessage = dview.findViewById(R.id.rvMessage);
+            final Button btnExecute = dview.findViewById(R.id.btnExecute);
             final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
 
             rvMessage.setHasFixedSize(false);
@@ -1048,23 +1053,72 @@ public class FragmentRule extends FragmentBase {
 
             tvNoMessages.setVisibility(View.GONE);
             rvMessage.setVisibility(View.GONE);
+            btnExecute.setVisibility(View.GONE);
             pbWait.setVisibility(View.VISIBLE);
 
-            Bundle args = new Bundle();
+            final Bundle args = new Bundle();
             args.putLong("folder", folder);
             args.putString("condition", condition);
+            args.putString("action", action);
+
+            btnExecute.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    new SimpleTask<Integer>() {
+                        @Override
+                        protected Integer onExecute(Context context, Bundle args) throws Throwable {
+                            EntityRule rule = new EntityRule();
+                            rule.folder = args.getLong("folder");
+                            rule.condition = args.getString("condition");
+                            rule.action = args.getString("action");
+
+                            int applied = 0;
+
+                            DB db = DB.getInstance(context);
+                            List<Long> ids = db.message().getMessageIdsByFolder(rule.folder);
+                            for (long mid : ids)
+                                try {
+                                    db.beginTransaction();
+
+                                    EntityMessage message = db.message().getMessage(mid);
+
+                                    if (rule.matches(context, message, null))
+                                        if (rule.execute(context, message))
+                                            applied++;
+
+                                    db.setTransactionSuccessful();
+                                } finally {
+                                    db.endTransaction();
+                                }
+
+                            return applied;
+                        }
+
+                        @Override
+                        protected void onExecuted(Bundle args, Integer applied) {
+                            ToastEx.makeText(getContext(), getString(R.string.title_rule_applied, applied), Toast.LENGTH_LONG).show();
+                        }
+
+                        @Override
+                        protected void onException(Bundle args, Throwable ex) {
+                            Helper.unexpectedError(getFragmentManager(), ex);
+                        }
+                    }.execute(FragmentDialogCheck.this, args, "rule:execute");
+                }
+            });
 
             new SimpleTask<List<EntityMessage>>() {
                 @Override
                 protected List<EntityMessage> onExecute(Context context, Bundle args) throws Throwable {
-                    long fid = args.getLong("folder");
                     EntityRule rule = new EntityRule();
+                    rule.folder = args.getLong("folder");
                     rule.condition = args.getString("condition");
+                    rule.action = args.getString("action");
 
                     List<EntityMessage> matching = new ArrayList<>();
 
                     DB db = DB.getInstance(context);
-                    List<Long> ids = db.message().getMessageIdsByFolder(fid);
+                    List<Long> ids = db.message().getMessageIdsByFolder(rule.folder);
                     for (long id : ids) {
                         EntityMessage message = db.message().getMessage(id);
 
@@ -1083,9 +1137,10 @@ public class FragmentRule extends FragmentBase {
                     adapter.set(messages);
 
                     pbWait.setVisibility(View.GONE);
-                    if (messages.size() > 0)
+                    if (messages.size() > 0) {
                         rvMessage.setVisibility(View.VISIBLE);
-                    else
+                        btnExecute.setVisibility(View.VISIBLE);
+                    } else
                         tvNoMessages.setVisibility(View.VISIBLE);
                 }
 
diff --git a/app/src/main/res/layout/dialog_rule_match.xml b/app/src/main/res/layout/dialog_rule_match.xml
index 6b82e0d413..cc98dab461 100644
--- a/app/src/main/res/layout/dialog_rule_match.xml
+++ b/app/src/main/res/layout/dialog_rule_match.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:padding="12dp">
 
     <TextView
         android:id="@+id/tvNoMessages"
@@ -21,9 +22,22 @@
         android:padding="12dp"
         android:scrollbarStyle="outsideOverlay"
         android:scrollbars="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/btnExecute"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/btnExecute"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:padding="12dp"
+        android:text="@string/title_rule_execute"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"