Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-28 03:36:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved read only folder support

Browse Source
This commit is contained in:
M66B
2019-07-07 09:25:52 +02:00
parent beba3b3815
commit 9e5ccb28b9
12 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1196,6 +1196,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null)
return 0;
if (message.folderReadOnly)
return 0;
if (EntityFolder.OUTBOX.equals(message.folderType))
return 0;
@@ -2846,7 +2849,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
boolean archivable = false;
for (EntityMessage message : messages) {
EntityFolder folder = db.folder().getFolder(message.folder);
if (!EntityFolder.DRAFTS.equals(folder.type) &&
if (!folder.read_only &&
!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.OUTBOX.equals(folder.type) &&
// allow sent
!EntityFolder.TRASH.equals(folder.type) &&
@@ -2856,7 +2861,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (!EntityFolder.OUTBOX.equals(folder.type))
snoozable = true;
if (!EntityFolder.isOutgoing(folder.type) &&
if (!folder.read_only &&
!EntityFolder.isOutgoing(folder.type) &&
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type) &&
!EntityFolder.ARCHIVE.equals(folder.type))
@@ -2912,10 +2918,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null)
return null;
EntityFolder folder = db.folder().getFolder(message.folder);
if (folder == null)
return null;
if (message.uid != null) {
if (!message.content)
EntityOperation.queue(context, message, EntityOperation.BODY);
if (!message.ui_seen)
if (!message.ui_seen && !folder.read_only)
EntityOperation.queue(context, message, EntityOperation.SEEN, true);
}