msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Small improvement

Browse Source
pull/172/head
M66B 5 years ago
parent 1eea41077f
commit a8de91492b
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File

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

@ -747,8 +747,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
List<EntityMessage> messages = db.message().getMessagesByThread(
aid, thread, threading ? null : id, null);
for (EntityMessage threaded : messages)
result.add(threaded.id);
for (EntityMessage threaded : messages) {
EntityFolder folder = db.folder().getFolder(threaded.folder);
if (folder != null && !folder.read_only)
result.add(threaded.id);
}
db.setTransactionSuccessful();
} finally {
@ -806,7 +809,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
aid, thread, threading ? null : id, null);
for (EntityMessage threaded : messages) {
EntityFolder folder = db.folder().getFolder(threaded.folder);
if (!target.id.equals(threaded.folder) &&
if (!folder.read_only &&
!target.id.equals(threaded.folder) &&
!EntityFolder.DRAFTS.equals(folder.type) && !EntityFolder.OUTBOX.equals(folder.type) &&
(!EntityFolder.SENT.equals(folder.type) || EntityFolder.TRASH.equals(target.type)) &&
!EntityFolder.TRASH.equals(folder.type) && !EntityFolder.JUNK.equals(folder.type))
@ -3564,6 +3568,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
DB db = DB.getInstance(context);
EntityFolder trash = db.folder().getFolderByType(account, EntityFolder.TRASH);
EntityFolder archive = db.folder().getFolderByType(account, EntityFolder.ARCHIVE);
List<EntityMessage> messages = db.message().getMessagesByThread(
account, thread, threading ? null : id, null);
@ -3573,12 +3580,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
for (EntityMessage message : messages) {
EntityFolder folder = db.folder().getFolder(message.folder);
if (!folder.read_only &&
!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.OUTBOX.equals(folder.type) &&
// allow sent
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type))
if (!folder.read_only && (trash == null ||
(!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.OUTBOX.equals(folder.type) &&
// allow sent
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type))))
trashable = true;
if (!EntityFolder.OUTBOX.equals(folder.type))
@ -3592,9 +3599,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
archivable = true;
}
EntityFolder trash = db.folder().getFolderByType(account, EntityFolder.TRASH);
EntityFolder archive = db.folder().getFolderByType(account, EntityFolder.ARCHIVE);
return new Boolean[]{
trash == null,
trashable,

Write Preview
Loading…
Cancel
Save