Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-30 17:40:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete junk or all rules

Browse Source
This commit is contained in:
M66B
2020-09-08 14:02:19 +02:00
parent 924ee857da
commit 2ecbb4f86f
4 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/faircode/email/FragmentRules.java
View File

@@ -229,25 +229,30 @@ public class FragmentRules extends FragmentBase {
@Override
public void onPrepareOptionsMenu(@NonNull Menu menu) {
super.onPrepareOptionsMenu(menu);
menu.findItem(R.id.menu_clear_spam).setVisible(!EntityFolder.JUNK.equals(type));
menu.findItem(R.id.menu_delete_junk).setVisible(!EntityFolder.JUNK.equals(type));
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_clear_spam:
onMenuClearSpam();
case R.id.menu_delete_all:
onMenuDelete(true);
return true;
case R.id.menu_delete_junk:
onMenuDelete(false);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
private void onMenuClearSpam() {
private void onMenuDelete(boolean all) {
Bundle aargs = new Bundle();
aargs.putString("question", getString(R.string.title_rules_clear_confirm));
aargs.putString("question", getString(all
? R.string.title_rules_delete_all_confirm
: R.string.title_rules_delete_junk_confirm));
aargs.putLong("folder", folder);
aargs.putBoolean("all", all);
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
@@ -279,8 +284,15 @@ public class FragmentRules extends FragmentBase {
@Override
protected Void onExecute(Context context, Bundle args) throws Throwable {
long fid = args.getLong("folder");
boolean all = args.getBoolean("all");
DB db = DB.getInstance(context);
if (all) {
db.rule().deleteRules(fid);
return null;
}
EntityFolder folder = db.folder().getFolder(fid);
if (folder == null)
return null;
@@ -295,8 +307,9 @@ public class FragmentRules extends FragmentBase {
for (EntityRule rule : rules) {
JSONObject jaction = new JSONObject(rule.action);
if (jaction.optInt("type", -1) == TYPE_MOVE &&
jaction.optInt("target", -1) == junk.id)
int type = jaction.optInt("type", -1);
long target = jaction.optLong("target", -1);
if (type == TYPE_MOVE && target == junk.id)
db.rule().deleteRule(rule.id);
}