Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 23:26:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Header rules, improvements

Browse Source
This commit is contained in:
M66B
2019-01-18 13:04:05 +00:00
parent 2ac7976681
commit d9528a3ca4
5 changed files with 101 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,8 @@ public class FragmentRule extends FragmentBase {
private CheckBox cbSender;
private EditText etSubject;
private CheckBox cbSubject;
private EditText etHeader;
private CheckBox cbHeader;
private Spinner spAction;
private Spinner spTarget;
private BottomNavigationView bottom_navigation;
@@ -95,6 +97,8 @@ public class FragmentRule extends FragmentBase {
cbSender = view.findViewById(R.id.cbSender);
etSubject = view.findViewById(R.id.etSubject);
cbSubject = view.findViewById(R.id.cbSubject);
etHeader = view.findViewById(R.id.etHeader);
cbHeader = view.findViewById(R.id.cbHeader);
spAction = view.findViewById(R.id.spAction);
spTarget = view.findViewById(R.id.spTarget);
bottom_navigation = view.findViewById(R.id.bottom_navigation);
@@ -208,6 +212,7 @@ public class FragmentRule extends FragmentBase {
JSONObject jsender = jcondition.optJSONObject("sender");
JSONObject jsubject = jcondition.optJSONObject("subject");
JSONObject jheader = jcondition.optJSONObject("header");
etName.setText(rule == null ? null : rule.name);
etOrder.setText(rule == null ? null : Integer.toString(rule.order));
@@ -217,6 +222,8 @@ public class FragmentRule extends FragmentBase {
cbSender.setChecked(jsender != null && jsender.optBoolean("regex", false));
etSubject.setText(jsubject == null ? null : jsubject.optString("value"));
cbSubject.setChecked(jsubject != null && jsubject.optBoolean("regex", false));
etHeader.setText(jheader == null ? null : jheader.optString("value"));
cbHeader.setChecked(jheader != null && jheader.optBoolean("regex", false));
int type = jaction.optInt("type", -1);
for (int pos = 0; pos < adapterAction.getCount(); pos++)
@@ -329,6 +336,14 @@ public class FragmentRule extends FragmentBase {
jcondition.put("subject", jsubject);
}
String header = etHeader.getText().toString();
if (!TextUtils.isEmpty(header)) {
JSONObject jheader = new JSONObject();
jheader.put("value", header);
jheader.put("regex", cbHeader.isChecked());
jcondition.put("header", jheader);
}
JSONObject jaction = new JSONObject();
Action action = (Action) spAction.getSelectedItem();
@@ -378,8 +393,9 @@ public class FragmentRule extends FragmentBase {
JSONObject jcondition = new JSONObject(condition);
JSONObject jsender = jcondition.optJSONObject("sender");
JSONObject jsubject = jcondition.optJSONObject("subject");
JSONObject jheader = jcondition.optJSONObject("header");
if (jsender == null && jsubject == null)
if (jsender == null && jsubject == null && jheader == null)
throw new IllegalArgumentException(context.getString(R.string.title_rule_condition_missing));
if (TextUtils.isEmpty(order))