mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Delete when no archive/junk

This commit is contained in:
M66B 2020-03-02 08:42:49 +01:00
parent 54181aaed1
commit 7ba052ef18
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -3042,6 +3042,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean inJunk = EntityFolder.JUNK.equals(message.folderType);
final boolean delete = (inTrash || !hasTrash);
if (!hasArchive && !hasJunk) {
if (delete)
onActionDelete(message);
else
properties.move(message.id, EntityFolder.TRASH);
return;
}
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, ibMore);
popupMenu.inflate(R.menu.popup_message_move);
popupMenu.getMenu().findItem(R.id.menu_archive).setEnabled(message.uid != null && (hasArchive && !inArchive));
@ -3069,6 +3077,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
}
});
popupMenu.show();
}