mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Small improvements

Browse source
This commit is contained in:
M66B 2019-04-28 10:10:44 +02:00
parent a0e6bd9790
commit b2a820f932
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/Core.java
View file

@ -406,7 +406,7 @@ class Core {
// Delete previous message(s) with same ID
if (folder.id.equals(message.folder)) {
// Prevent adding/deleting message
db.message().setMessageUid(message.id, -1L);
db.message().setMessageUid(message.id, message.uid == null ? -1L : -message.uid);
Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid));
for (Message idelete : ideletes) {
@ -490,10 +490,16 @@ class Core {
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
if (folder.id.equals(message.folder))
if (folder.id.equals(message.folder)) {
Log.i(folder.name + " Setting id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid);
else {
} else {
// Cross account move
if (jargs.length() > 0 && !jargs.isNull(0)) {
long tmpid = jargs.getLong(0);
Log.i(folder.name + " Setting id=" + tmpid + " (tmp) appended uid=" + uid);
db.message().setMessageUid(tmpid, uid);
}
try {
db.beginTransaction();
@ -514,7 +520,7 @@ class Core {
}
} catch (Throwable ex) {
if (folder.id.equals(message.folder))
db.message().setMessageUid(message.id, null);
db.message().setMessageUid(message.id, message.uid);
throw ex;
}
}