mirror of
https://github.com/M66B/FairEmail.git
synced 2024-12-21 23:32:51 +00:00
Revert "Allow trashing/archiving of sent messages when not threading"
This reverts commit 3aafbcfd5c
.
This commit is contained in:
parent
22d27e1427
commit
e1e6fd4e43
1 changed files with 2 additions and 4 deletions
|
@ -8047,7 +8047,7 @@ public class FragmentMessages extends FragmentBase
|
||||||
if (!folder.read_only &&
|
if (!folder.read_only &&
|
||||||
!EntityFolder.DRAFTS.equals(folder.type) &&
|
!EntityFolder.DRAFTS.equals(folder.type) &&
|
||||||
!EntityFolder.OUTBOX.equals(folder.type) &&
|
!EntityFolder.OUTBOX.equals(folder.type) &&
|
||||||
(!EntityFolder.SENT.equals(folder.type) || move_thread_sent || !threading) &&
|
(!EntityFolder.SENT.equals(folder.type) || move_thread_sent) &&
|
||||||
!EntityFolder.TRASH.equals(folder.type) &&
|
!EntityFolder.TRASH.equals(folder.type) &&
|
||||||
!EntityFolder.JUNK.equals(folder.type))
|
!EntityFolder.JUNK.equals(folder.type))
|
||||||
trashable = true;
|
trashable = true;
|
||||||
|
@ -8056,9 +8056,7 @@ public class FragmentMessages extends FragmentBase
|
||||||
snoozable = true;
|
snoozable = true;
|
||||||
|
|
||||||
if (!folder.read_only &&
|
if (!folder.read_only &&
|
||||||
!EntityFolder.DRAFTS.equals(folder.type) &&
|
!EntityFolder.isOutgoing(folder.type) &&
|
||||||
!EntityFolder.OUTBOX.equals(folder.type) &&
|
|
||||||
(!EntityFolder.SENT.equals(folder.type) || !threading) &&
|
|
||||||
!EntityFolder.TRASH.equals(folder.type) &&
|
!EntityFolder.TRASH.equals(folder.type) &&
|
||||||
!EntityFolder.JUNK.equals(folder.type) &&
|
!EntityFolder.JUNK.equals(folder.type) &&
|
||||||
!EntityFolder.ARCHIVE.equals(folder.type))
|
!EntityFolder.ARCHIVE.equals(folder.type))
|
||||||
|
|
Loading…
Reference in a new issue