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

Added empty spam

Browse Source
This commit is contained in:
M66B
2019-09-30 09:15:47 +02:00
parent c38330b35d
commit ed98ea5e6f
5 changed files with 84 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@@ -390,6 +390,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (EntityFolder.TRASH.equals(folder.type))
popupMenu.getMenu().add(Menu.NONE, R.string.title_empty_trash, 5, R.string.title_empty_trash);
else if (EntityFolder.JUNK.equals(folder.type))
popupMenu.getMenu().add(Menu.NONE, R.string.title_empty_spam, 5, R.string.title_empty_spam);
}
if (folder.account != null) {
@@ -465,7 +467,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
return true;
case R.string.title_empty_trash:
onActionEmptyTrash();
onActionEmpty(EntityFolder.TRASH);
return true;
case R.string.title_empty_spam:
onActionEmpty(EntityFolder.JUNK);
return true;
case R.string.title_edit_rules:
@@ -602,15 +608,21 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
ask.show(parentFragment.getFragmentManager(), "folder:delete_local");
}
private void onActionEmptyTrash() {
private void onActionEmpty(String type) {
Bundle aargs = new Bundle();
aargs.putString("question", context.getString(R.string.title_empty_trash_ask));
if (EntityFolder.TRASH.equals(type))
aargs.putString("question", context.getString(R.string.title_empty_trash_ask));
else if (EntityFolder.JUNK.equals(type))
aargs.putString("question", context.getString(R.string.title_empty_spam_ask));
else
throw new IllegalArgumentException("Invalid folder type=" + type);
aargs.putLong("folder", folder.id);
aargs.putString("type", type);
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(parentFragment, FragmentFolders.REQUEST_EMPTY_TRASH);
ask.show(parentFragment.getFragmentManager(), "folder:empty_trash");
ask.setTargetFragment(parentFragment, FragmentFolders.REQUEST_EMPTY_FOLDER);
ask.show(parentFragment.getFragmentManager(), "folder:empty");
}
private void onActionEditRules() {