Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 03:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow rules for specific attachment mime types

Browse Source
This commit is contained in:
M66B
2020-06-20 09:35:05 +02:00
parent 3754cf966c
commit 6afefb61b7
4 changed files with 52 additions and 2 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

@@ -100,6 +100,7 @@ public class FragmentRule extends FragmentBase {
private CheckBox cbSubject;
private CheckBox cbAttachments;
private EditText etMimeType;
private EditText etHeader;
private CheckBox cbHeader;
@@ -211,6 +212,7 @@ public class FragmentRule extends FragmentBase {
cbSubject = view.findViewById(R.id.cbSubject);
cbAttachments = view.findViewById(R.id.cbAttachments);
etMimeType = view.findViewById(R.id.etMimeType);
etHeader = view.findViewById(R.id.etHeader);
cbHeader = view.findViewById(R.id.cbHeader);
@@ -291,6 +293,13 @@ public class FragmentRule extends FragmentBase {
}
});
cbAttachments.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
etMimeType.setEnabled(isChecked);
}
});
adapterDay = new ArrayAdapter<>(getContext(), R.layout.spinner_item1, android.R.id.text1, new ArrayList<String>());
adapterDay.setDropDownViewResource(R.layout.spinner_item1_dropdown);
spScheduleDayStart.setAdapter(adapterDay);
@@ -737,6 +746,8 @@ public class FragmentRule extends FragmentBase {
cbSubject.setChecked(jsubject != null && jsubject.getBoolean("regex"));
cbAttachments.setChecked(jcondition.optBoolean("attachments"));
etMimeType.setText(jcondition.optString("mimetype"));
etMimeType.setEnabled(cbAttachments.isChecked());
etHeader.setText(jheader == null ? null : jheader.getString("value"));
cbHeader.setChecked(jheader != null && jheader.getBoolean("regex"));
@@ -1037,6 +1048,7 @@ public class FragmentRule extends FragmentBase {
}
jcondition.put("attachments", cbAttachments.isChecked());
jcondition.put("mimetype", etMimeType.getText().toString().trim());
String header = etHeader.getText().toString();
if (!TextUtils.isEmpty(header)) {