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

Allow deleting trash/spam of all accounts

Browse Source
This commit is contained in:
M66B
2020-01-01 10:08:04 +01:00
parent b532374c28
commit 64af3ba9b8
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -2927,10 +2927,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
menu.findItem(R.id.menu_select_all).setVisible(!outbox &&
(viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER));
menu.findItem(R.id.menu_select_found).setVisible(viewType == AdapterMessage.ViewType.SEARCH);
menu.findItem(R.id.menu_empty_trash).setVisible(
viewType == AdapterMessage.ViewType.FOLDER && EntityFolder.TRASH.equals(type));
menu.findItem(R.id.menu_empty_spam).setVisible(
viewType == AdapterMessage.ViewType.FOLDER && EntityFolder.JUNK.equals(type));
menu.findItem(R.id.menu_empty_trash).setVisible(EntityFolder.TRASH.equals(type) &&
(viewType == AdapterMessage.ViewType.UNIFIED ||
viewType == AdapterMessage.ViewType.FOLDER));
menu.findItem(R.id.menu_empty_spam).setVisible(EntityFolder.JUNK.equals(type) &&
(viewType == AdapterMessage.ViewType.UNIFIED ||
viewType == AdapterMessage.ViewType.FOLDER));
menu.findItem(R.id.menu_force_sync).setVisible(viewType == AdapterMessage.ViewType.UNIFIED);
@@ -3132,12 +3134,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private void onMenuEmpty(String type) {
Bundle aargs = new Bundle();
if (EntityFolder.TRASH.equals(type))
aargs.putString("question", getString(R.string.title_empty_trash_ask));
aargs.putString("question", getString(
account < 0 ? R.string.title_empty_trash_all_ask : R.string.title_empty_trash_ask));
else if (EntityFolder.JUNK.equals(type))
aargs.putString("question", getString(R.string.title_empty_spam_ask));
aargs.putString("question", getString(
account < 0 ? R.string.title_empty_spam_all_ask : R.string.title_empty_spam_ask));
else
throw new IllegalArgumentException("Invalid folder type=" + type);
aargs.putLong("folder", folder);
aargs.putLong("account", account);
aargs.putString("type", type);
FragmentDialogAsk ask = new FragmentDialogAsk();
@@ -5349,25 +5353,36 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long fid = args.getLong("folder");
long aid = args.getLong("account");
String type = args.getString("type");
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityFolder folder = db.folder().getFolder(fid);
if (folder == null)
return null;
List<EntityAccount> accounts;
if (account < 0)
accounts = db.account().getSynchronizingAccounts();
else {
EntityAccount account = db.account().getAccount(aid);
if (account == null)
return null;
accounts = Arrays.asList(account);
}
if (!folder.type.equals(type))
throw new IllegalStateException("Invalid folder type=" + type);
for (EntityAccount account : accounts) {
EntityFolder folder = db.folder().getFolderByType(account.id, type);
if (folder == null)
continue;
List<Long> ids = db.message().getMessageByFolder(folder.id);
for (Long id : ids) {
EntityMessage message = db.message().getMessage(id);
if (message.uid != null || !TextUtils.isEmpty(message.msgid))
EntityOperation.queue(context, message, EntityOperation.DELETE);
List<Long> ids = db.message().getMessageByFolder(folder.id);
for (Long id : ids) {
EntityMessage message = db.message().getMessage(id);
if (message.uid != null || !TextUtils.isEmpty(message.msgid)) {
Log.i("Deleting account=" + account.id + " folder=" + folder.id + " message=" + message.id);
EntityOperation.queue(context, message, EntityOperation.DELETE);
}
}
}
db.setTransactionSuccessful();