From b03ed1afdf780e05ed47b1daa986066de3df6eae Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 25 Mar 2022 10:48:49 +0100
Subject: [PATCH] Added edit filter rules to nav menu

---
 .../java/eu/faircode/email/ActivityView.java  | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 49d2e721cb..95419d6476 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -173,6 +173,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     static final long UPDATE_DAILY = (BuildConfig.BETA_RELEASE ? 4 : 12) * 3600 * 1000L; // milliseconds
     static final long UPDATE_WEEKLY = 7 * 24 * 3600 * 1000L; // milliseconds
 
+    private static final int REQUEST_RULES_ACCOUNT = 2001;
+    private static final int REQUEST_RULES_FOLDER = 2002;
+
     @Override
     @SuppressLint("MissingSuperCall")
     protected void onCreate(Bundle savedInstanceState) {
@@ -767,6 +770,15 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             }
         }));
 
+        menus.add(new NavMenuItem(R.drawable.twotone_filter_alt_24, R.string.title_edit_rules, new Runnable() {
+            @Override
+            public void run() {
+                if (!drawerLayout.isLocked(drawerContainer))
+                    drawerLayout.closeDrawer(drawerContainer);
+                onMenuRulesAccount();
+            }
+        }));
+
         menus.add(new NavMenuItem(R.drawable.twotone_settings_24, R.string.menu_setup, new Runnable() {
             @Override
             public void run() {
@@ -1021,6 +1033,26 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         super.onDestroy();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        try {
+            switch (requestCode) {
+                case REQUEST_RULES_ACCOUNT:
+                    if (resultCode == RESULT_OK && data != null)
+                        onMenuRulesFolder(data.getBundleExtra("args"));
+                    break;
+                case REQUEST_RULES_FOLDER:
+                    if (resultCode == RESULT_OK && data != null)
+                        onMenuRules(data.getBundleExtra("args"));
+                    break;
+            }
+        } catch (Throwable ex) {
+            Log.e(ex);
+        }
+    }
+
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -1752,6 +1784,31 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         fragmentTransaction.commit();
     }
 
+    private void onMenuRulesAccount() {
+        FragmentDialogSelectAccount fragment = new FragmentDialogSelectAccount();
+        fragment.setArguments(new Bundle());
+        fragment.setTargetActivity(this, REQUEST_RULES_ACCOUNT);
+        fragment.show(getSupportFragmentManager(), "rules:account");
+    }
+
+    private void onMenuRulesFolder(Bundle args) {
+        args.putString("title", getString(R.string.title_edit_rules));
+        args.putLongArray("disabled", new long[0]);
+
+        FragmentDialogFolder fragment = new FragmentDialogFolder();
+        fragment.setArguments(args);
+        fragment.setTargetActivity(this, REQUEST_RULES_FOLDER);
+        fragment.show(getSupportFragmentManager(), "rules:folder");
+    }
+
+    private void onMenuRules(Bundle args) {
+        FragmentRules fragment = new FragmentRules();
+        fragment.setArguments(args);
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("rules");
+        fragmentTransaction.commit();
+    }
+
     private void onMenuSetup() {
         startActivity(new Intent(ActivityView.this, ActivitySetup.class)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));