Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-30 17:40:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed dependency on UIDPLUS

Browse Source
This commit is contained in:
M66B
2019-06-14 08:31:37 +02:00
parent 5e54bc0c6a
commit fc2840ae30
3 changed files with 106 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,9 +117,8 @@ public class EntityOperation {
else if (MOVE.equals(name)) {
// Parameters:
// 0: target folder id
// 1: allow auto read
// 2: temporary target message id
// 0: target folder
// 1: auto read
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean autoread = prefs.getBoolean("autoread", false);
@@ -144,7 +143,6 @@ public class EntityOperation {
// Create copy without uid in target folder
// Message with same msgid can be in archive
Long tmpid = null;
if (message.uid != null &&
target.synchronize &&
message.received > cal_keep.getTimeInMillis() &&
@@ -171,7 +169,7 @@ public class EntityOperation {
message.ui_browsed = false;
message.id = db.message().insertMessage(message);
File mtarget = message.getFile(context);
tmpid = message.id;
long tmpid = message.id;
message.id = id;
message.account = source.account;
@@ -194,25 +192,13 @@ public class EntityOperation {
EntityAttachment.copy(context, message.id, tmpid);
}
if (source.account.equals(target.account))
jargs.put(2, tmpid); // Can be null
else {
// Cross account move
// Cross account move
if (!source.account.equals(target.account))
if (message.raw != null && message.raw) {
name = ADD;
folder = target.id;
jargs = new JSONArray();
jargs.put(0, tmpid); // Can be null
jargs.put(1, autoread);
jargs.put(2, true); // Cross account
} else {
} else
name = RAW;
jargs = new JSONArray();
jargs.put(0, tmpid); // Can be null
jargs.put(1, autoread);
jargs.put(2, target.id);
}
}
} else if (DELETE.equals(name))
db.message().setMessageUiHide(message.id, true);