mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 04:35:57 +00:00
Code Issues Releases Wiki Activity

Allow trashing selection

Browse source
This commit is contained in:
M66B 2018-12-02 16:21:31 +01:00
parent b783224f71
commit 4532720776
1 changed files with 68 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -579,12 +579,13 @@ public class FragmentMessages extends FragmentEx {
long fid = args.getLong("folder"); long fid = args.getLong("folder");
long[] ids = args.getLongArray("ids"); long[] ids = args.getLongArray("ids");
Boolean[] result = new Boolean[5]; Boolean[] result = new Boolean[6];
result[0] = false; result[0] = false;
result[1] = false; result[1] = false;
result[2] = false; result[2] = false;
result[3] = false; result[3] = false;
result[4] = false; result[4] = false;
result[5] = false;
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
@ -598,11 +599,15 @@ public class FragmentMessages extends FragmentEx {
if (folder != null && EntityFolder.TRASH.equals(folder.type)) if (folder != null && EntityFolder.TRASH.equals(folder.type))
result[4] = true; result[4] = true;
EntityMessage m0 = db.message().getMessage(ids[0]);
EntityFolder trash = db.folder().getFolderByType(m0.account, EntityFolder.TRASH);
result[5] = (trash != null);
return result; return result;
} }
@Override @Override
protected void onLoaded(Bundle args, Boolean[] result) { protected void onLoaded(Bundle args, final Boolean[] result) {
PopupMenu popupMenu = new PopupMenu(getContext(), fabMore); PopupMenu popupMenu = new PopupMenu(getContext(), fabMore);
if (result[0]) if (result[0])
@ -617,7 +622,7 @@ public class FragmentMessages extends FragmentEx {
popupMenu.getMenu().add(Menu.NONE, action_move, 5, R.string.title_move); popupMenu.getMenu().add(Menu.NONE, action_move, 5, R.string.title_move);
if (result[4]) if (result[4] || result[5]) // is trash or has trash
popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash); popupMenu.getMenu().add(Menu.NONE, action_trash, 6, R.string.title_trash);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@ -640,7 +645,10 @@ public class FragmentMessages extends FragmentEx {
onActionMove(); onActionMove();
return true; return true;
case action_trash: case action_trash:
onActionDelete(); if (result[4]) // is trash
onActionDelete();
else
onActionTrash();
return true; return true;
default: default:
return false; return false;
@ -764,12 +772,14 @@ public class FragmentMessages extends FragmentEx {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
EntityMessage message = db.message().getMessage(ids[0]); EntityMessage m0 = db.message().getMessage(ids[0]);
List<EntityFolder> folders = db.folder().getFolders(message.account); List<EntityFolder> folders = db.folder().getFolders(m0.account);
List<EntityFolder> targets = new ArrayList<>(); List<EntityFolder> targets = new ArrayList<>();
for (EntityFolder folder : folders) for (EntityFolder folder : folders)
if (!folder.hide && (fid < 0 ? !folder.unified : !folder.id.equals(fid))) if (!folder.hide &&
!EntityFolder.TRASH.equals(folder.type) &&
(fid < 0 ? !folder.unified : !folder.id.equals(fid)))
targets.add(folder); targets.add(folder);
EntityFolder.sort(targets); EntityFolder.sort(targets);
@ -850,6 +860,57 @@ public class FragmentMessages extends FragmentEx {
}.load(FragmentMessages.this, args); }.load(FragmentMessages.this, args);
} }
private void onActionTrash() {
Bundle args = new Bundle();
args.putLongArray("ids", getSelection());
selectionTracker.clearSelection();
new SimpleTask<MessageTarget>() {
@Override
protected MessageTarget onLoad(Context context, Bundle args) {
long[] ids = args.getLongArray("ids");
MessageTarget result = new MessageTarget();
DB db = DB.getInstance(context);
try {
db.beginTransaction();
EntityMessage m0 = db.message().getMessage(ids[0]);
result.target = db.folder().getFolderByType(m0.account, EntityFolder.TRASH);
for (long id : ids) {
EntityMessage message = db.message().getMessage(id);
List<EntityMessage> messages = db.message().getMessageByThread(
message.account, message.thread, threading ? null : id, message.ui_found);
for (EntityMessage threaded : messages)
if (threaded.folder.equals(message.folder)) {
result.ids.add(threaded.id);
db.message().setMessageUiHide(threaded.id, true);
}
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
return result;
}
@Override
protected void onLoaded(Bundle args, MessageTarget result) {
moveUndo(result);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.load(FragmentMessages.this, args);
}
private void onActionDelete() { private void onActionDelete() {
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner()) new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(R.string.title_ask_delete_selected) .setMessage(R.string.title_ask_delete_selected)