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

Simplify/fix auto seen/unflag

This commit is contained in:
M66B 2019-10-01 17:31:58 +02:00
parent 82ea6679e8
commit 2ff785f013
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/eu/faircode/email/Core.java
View File

@ -762,9 +762,6 @@ class Core {
// Get arguments
long id = jargs.getLong(0);
boolean autoread = jargs.optBoolean(1, false);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean autounflag = prefs.getBoolean("autounflag", false);
Flags flags = ifolder.getPermanentFlags();
// Get target folder
@ -808,16 +805,16 @@ class Core {
file.delete();
// Auto read
if (autoread && flags.contains(Flags.Flag.SEEN))
icopy.setFlag(Flags.Flag.SEEN, true);
if (flags.contains(Flags.Flag.SEEN))
icopy.setFlag(Flags.Flag.SEEN, message.ui_seen);
// Auto unflag
if (autounflag && flags.contains(Flags.Flag.FLAGGED))
icopy.setFlag(Flags.Flag.FLAGGED, false);
if (flags.contains(Flags.Flag.FLAGGED))
icopy.setFlag(Flags.Flag.FLAGGED, message.ui_flagged);
// Answered fix
if (message.ui_answered && flags.contains(Flags.Flag.ANSWERED))
icopy.setFlag(Flags.Flag.ANSWERED, true);
if (flags.contains(Flags.Flag.ANSWERED))
icopy.setFlag(Flags.Flag.ANSWERED, message.ui_answered);
// Set drafts flag
icopy.setFlag(Flags.Flag.DRAFT, EntityFolder.DRAFTS.equals(target.type));
@ -831,16 +828,16 @@ class Core {
EntityMessage message = map.get(imessage);
// Auto read
if (autoread && flags.contains(Flags.Flag.SEEN))
imessage.setFlag(Flags.Flag.SEEN, true);
if (flags.contains(Flags.Flag.SEEN))
imessage.setFlag(Flags.Flag.SEEN, message.ui_seen);
// Auto unflag
if (autounflag && flags.contains(Flags.Flag.FLAGGED))
imessage.setFlag(Flags.Flag.FLAGGED, false);
if (flags.contains(Flags.Flag.FLAGGED))
imessage.setFlag(Flags.Flag.FLAGGED, message.ui_flagged);
// Answered fix
if (message.ui_answered && flags.contains(Flags.Flag.ANSWERED))
imessage.setFlag(Flags.Flag.ANSWERED, true);
if (flags.contains(Flags.Flag.ANSWERED))
imessage.setFlag(Flags.Flag.ANSWERED, message.ui_answered);
}
ifolder.copyMessages(map.keySet().toArray(new Message[0]), itarget);

10
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@ -140,13 +140,12 @@ public class EntityOperation {
else if (MOVE.equals(name)) {
// Parameters:
// 0: target folder
// 1: auto read
// (1: auto read)
// 2: temporary message
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean autoread = prefs.getBoolean("autoread", false);
autoread = (autoread && jargs.optBoolean(1, true));
jargs.put(1, autoread);
boolean autounflag = prefs.getBoolean("autounflag", false);
EntityFolder source = db.folder().getFolder(message.folder);
EntityFolder target = db.folder().getFolder(jargs.getLong(0));
@ -156,11 +155,14 @@ public class EntityOperation {
EntityLog.log(context, "Move message=" + message.id + ":" + message.subject +
" source=" + source.id + ":" + source.name + "" +
" target=" + target.id + ":" + target.name +
" autoread=" + autoread);
" auto read=" + autoread + " flag=" + autounflag);
if (autoread)
db.message().setMessageUiSeen(message.id, true);
if (autounflag)
db.message().setMessageUiFlagged(message.id, false, null);
if (!EntityFolder.ARCHIVE.equals(source.type) ||
EntityFolder.TRASH.equals(target.type) || EntityFolder.JUNK.equals(target.type))
db.message().setMessageUiHide(message.id, true);