From 6d8824c7ca9053fcac90174c2880d4ffe949cc49 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 29 Jan 2024 10:57:56 +0100 Subject: [PATCH] Show rule absolute time in list --- app/src/main/java/eu/faircode/email/AdapterRule.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java index 6f27bac674..ef536b57b2 100644 --- a/app/src/main/java/eu/faircode/email/AdapterRule.java +++ b/app/src/main/java/eu/faircode/email/AdapterRule.java @@ -164,9 +164,17 @@ public class AdapterRule extends RecyclerView.Adapter { conditions.add(new Condition(context.getString(R.string.title_rule_body), jcondition.getJSONObject("body").optString("value"), jcondition.getJSONObject("body").optBoolean("regex"))); - if (jcondition.has("date")) + if (jcondition.has("date")) { + String range = null; + JSONObject jdate = jcondition.optJSONObject("date"); + if (jdate != null && jdate.has("after") && jdate.has("before")) { + long after = jdate.getLong("after"); + long before = jdate.getLong("before"); + range = DF.format(after) + " - " + DF.format(before); + } conditions.add(new Condition(context.getString(R.string.title_rule_time_abs), - null, null)); + range, null)); + } if (jcondition.has("schedule")) { String range = null; JSONObject jschedule = jcondition.optJSONObject("schedule");