From b57504816e8ebbcc2564dfd3dbcc68495cd752fd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 19 Apr 2023 21:54:10 +0200
Subject: [PATCH] Added younger than rule condition

---
 .../java/eu/faircode/email/EntityRule.java    | 11 ++++-
 .../java/eu/faircode/email/FragmentRule.java  | 12 +++++
 app/src/main/res/layout/fragment_rule.xml     | 46 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 2388d0382d..6ead7e556d 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -499,6 +499,14 @@ public class EntityRule {
                     return false;
             }
 
+            if (jcondition.has("younger")) {
+                int younger = jcondition.getInt("younger");
+                Calendar y = Calendar.getInstance();
+                y.add(Calendar.HOUR_OF_DAY, -younger);
+                if (message.received < y.getTimeInMillis())
+                    return false;
+            }
+
             // Safeguard
             if (jsender == null &&
                     jrecipient == null &&
@@ -507,7 +515,8 @@ public class EntityRule {
                     jheader == null &&
                     jbody == null &&
                     jdate == null &&
-                    jschedule == null)
+                    jschedule == null &&
+                    !jcondition.has("younger"))
                 return false;
         } catch (JSONException ex) {
             Log.e(ex);
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index e9ee492c92..d3359d3086 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -127,6 +127,7 @@ public class FragmentRule extends FragmentBase {
     private TextView tvScheduleHourStart;
     private TextView tvScheduleHourEnd;
     private CheckBox cbEveryDay;
+    private EditText etYounger;
 
     private Spinner spAction;
     private TextView tvActionRemark;
@@ -311,6 +312,7 @@ public class FragmentRule extends FragmentBase {
         tvScheduleHourStart = view.findViewById(R.id.tvScheduleHourStart);
         tvScheduleHourEnd = view.findViewById(R.id.tvScheduleHourEnd);
         cbEveryDay = view.findViewById(R.id.cbEveryDay);
+        etYounger = view.findViewById(R.id.etYounger);
 
         spAction = view.findViewById(R.id.spAction);
         tvActionRemark = view.findViewById(R.id.tvActionRemark);
@@ -1224,6 +1226,8 @@ public class FragmentRule extends FragmentBase {
                         int end = (jschedule != null && jschedule.has("end") ? jschedule.getInt("end") : 0);
 
                         cbEveryDay.setChecked(jschedule != null && jschedule.optBoolean("all"));
+                        etYounger.setText(jcondition.has("younger")
+                                ? Integer.toString(jcondition.optInt("younger")) : null);
 
                         spScheduleDayStart.setSelection(start / (24 * 60));
                         spScheduleDayEnd.setSelection(end / (24 * 60));
@@ -1625,6 +1629,14 @@ public class FragmentRule extends FragmentBase {
             jcondition.put("schedule", jschedule);
         }
 
+        String younger = etYounger.getText().toString().trim();
+        if (!TextUtils.isEmpty(younger) && TextUtils.isDigitsOnly(younger))
+            try {
+                jcondition.put("younger", Integer.parseInt(younger));
+            } catch (Throwable ex) {
+                Log.e(ex);
+            }
+
         return jcondition;
     }
 
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index 2bf4c06d4e..bf4808392f 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -139,7 +139,6 @@
                     android:layout_marginTop="12dp"
                     android:text="@string/title_rule_age"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorPrimary"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/cbDaily" />
@@ -715,6 +714,49 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvScheduleHourEnd" />
 
+                <TextView
+                    android:id="@+id/tvAndYounger"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:text="@string/title_rule_and"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="?android:attr/textColorPrimary"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/cbEveryDay" />
+
+                <View
+                    android:id="@+id/vSeparatorYounger"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/colorSeparator"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvAndYounger" />
+
+                <TextView
+                    android:id="@+id/tvYounger"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:text="@string/title_rule_younger"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/vSeparatorYounger" />
+
+                <eu.faircode.email.EditTextPlain
+                    android:id="@+id/etYounger"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/title_optional"
+                    android:importantForAutofill="no"
+                    android:inputType="text|number"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvYounger" />
+
                 <TextView
                     android:id="@+id/tvAction"
                     android:layout_width="wrap_content"
@@ -725,7 +767,7 @@
                     android:textColor="?android:attr/textColorPrimary"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/cbEveryDay" />
+                    app:layout_constraintTop_toBottomOf="@+id/etYounger" />
 
                 <View
                     android:id="@+id/vSeparatorAction"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9cb3c45a1a..b2ac1f6738 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1885,6 +1885,7 @@
     <string name="title_rule_time_before">Received before</string>
     <string name="title_rule_time_rel">Relative time (received) between</string>
     <string name="title_rule_time_every_day">Every day</string>
+    <string name="title_rule_younger">Messages younger than (hours)</string>
     <string name="title_rule_regex">Regex</string>
     <string name="title_rule_and">AND</string>
     <string name="title_rule_action">Action</string>