Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added younger than rule condition

Browse Source
This commit is contained in:
M66B
2023-04-19 21:54:10 +02:00
parent 06e646c29a
commit b57504816e
4 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/FragmentRule.java
View File

@@ -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;
}