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

Delete junk

This commit is contained in:
M66B 2020-04-16 09:06:37 +02:00
parent d548f75b33
commit 7dd42832d8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1555,7 +1555,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean junk = (move && (hasJunk && !inJunk));
boolean unjunk = (move && inJunk);
final boolean delete = (inTrash || !hasTrash || outbox ||
final boolean delete = (inTrash || !hasTrash || inJunk || outbox ||
message.uid == null || message.accountProtocol == EntityAccount.TYPE_POP);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

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

@ -1624,6 +1624,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message.folderReadOnly)
return 0;
if (EntityFolder.JUNK.equals(message.folderType))
return 0;
if (EntityFolder.OUTBOX.equals(message.folderType))
return 0;
@ -2429,13 +2432,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
importance.add(Menu.NONE, R.string.title_importance_low, 3, R.string.title_importance_low)
.setEnabled(!EntityMessage.PRIORITIY_LOW.equals(result.importance));
if (result.hasArchive && !result.isArchive) // has archive and not is archive/drafts
if (result.hasArchive && !result.isArchive) // has archive and not is archive
popupMenu.getMenu().add(Menu.NONE, R.string.title_archive, order++, R.string.title_archive);
if (result.isTrash || !result.hasTrash) // is trash or no trash
if (result.isTrash || !result.hasTrash || result.isJunk) // is trash or no trash or is junk
popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, order++, R.string.title_delete);
if (!result.isTrash && result.hasTrash) // not trash and has trash
if (!result.isTrash && result.hasTrash && !result.isJunk) // not trash and has trash and not is junk
popupMenu.getMenu().add(Menu.NONE, R.string.title_trash, order++, R.string.title_trash);
if (result.hasJunk && !result.isJunk && !result.isDrafts) // has junk and not junk/drafts