Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-28 08:32:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2019-03-14 07:45:13 +00:00
parent 6d1438f31f
commit 98b84f8927
11 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import android.preference.PreferenceManager;
import org.json.JSONArray;
import org.json.JSONException;
import java.io.File;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
@@ -140,6 +141,8 @@ public class EntityOperation {
target.synchronize &&
message.received > cal_keep.getTimeInMillis() &&
db.message().countMessageByMsgId(target.id, message.msgid) == 0) {
File msource = message.getFile(context);
// Copy message to target folder
long id = message.id;
long uid = message.uid;
@@ -153,7 +156,9 @@ public class EntityOperation {
message.seen = true;
message.ui_seen = true;
}
tmpid = db.message().insertMessage(message);
message.id = db.message().insertMessage(message);
File mtarget = message.getFile(context);
tmpid = message.id;
message.id = id;
message.account = source.account;
@@ -164,9 +169,7 @@ public class EntityOperation {
if (message.content)
try {
Helper.copy(
EntityMessage.getFile(context, id),
EntityMessage.getFile(context, tmpid));
Helper.copy(msource, mtarget);
} catch (IOException ex) {
Log.e(ex);
db.message().setMessageContent(tmpid, false, null, null);