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

Store copy of message in target folder

Browse Source
This commit is contained in:
M66B
2019-01-04 18:37:56 +00:00
parent e01728a202
commit 1b5156dfc5
11 changed files with 108 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,10 +19,14 @@ package eu.faircode.email;
Copyright 2018-2019 by Marcel Bokhorst (M66B)
*/
import android.content.Context;
import org.json.JSONArray;
import org.json.JSONException;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.room.Entity;
@@ -72,22 +76,22 @@ public class EntityOperation {
static final String ATTACHMENT = "attachment";
static final String SYNC = "sync";
static void queue(DB db, EntityMessage message, String name) {
static void queue(Context context, DB db, EntityMessage message, String name) {
JSONArray jargs = new JSONArray();
queue(db, message, name, jargs);
queue(context, db, message, name, jargs);
}
static void queue(DB db, EntityMessage message, String name, Object value) {
static void queue(Context context, DB db, EntityMessage message, String name, Object value) {
JSONArray jargs = new JSONArray();
jargs.put(value);
queue(db, message, name, jargs);
queue(context, db, message, name, jargs);
}
static void queue(DB db, EntityMessage message, String name, Object value1, Object value2) {
static void queue(Context context, DB db, EntityMessage message, String name, Object value1, Object value2) {
JSONArray jargs = new JSONArray();
jargs.put(value1);
jargs.put(value2);
queue(db, message, name, jargs);
queue(context, db, message, name, jargs);
}
static void sync(DB db, long fid) {
@@ -121,7 +125,7 @@ public class EntityOperation {
}
}
private static void queue(DB db, EntityMessage message, String name, JSONArray jargs) {
private static void queue(Context context, DB db, EntityMessage message, String name, JSONArray jargs) {
try {
if (SEEN.equals(name)) {
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
@@ -139,9 +143,53 @@ public class EntityOperation {
else if (MOVE.equals(name)) {
EntityFolder source = db.folder().getFolder(message.folder);
if (!EntityFolder.ARCHIVE.equals(source.type))
EntityFolder target = db.folder().getFolder(jargs.getLong(0));
if (!EntityFolder.ARCHIVE.equals(source.type) || EntityFolder.TRASH.equals(target.type))
db.message().setMessageUiHide(message.id, true);
// Create copy without uid in target folder
// Message with same msgid can be in archive and source folder
if (db.message().countMessageByMsgId(target.id, message.msgid) == 0) {
long id = message.id;
long uid = message.uid;
message.id = null;
message.uid = null;
message.folder = target.id;
long newid = db.message().insertMessage(message);
message.id = id;
message.uid = uid;
message.folder = source.id;
if (message.content)
try {
Helper.copy(
EntityMessage.getFile(context, id),
EntityMessage.getFile(context, newid));
} catch (IOException ex) {
Log.e(ex);
db.message().setMessageContent(newid, false, null);
}
List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
for (EntityAttachment attachment : attachments) {
long aid = attachment.id;
attachment.id = null;
attachment.message = newid;
attachment.progress = null;
attachment.id = db.attachment().insertAttachment(attachment);
if (attachment.available)
try {
Helper.copy(
EntityAttachment.getFile(context, aid),
EntityAttachment.getFile(context, attachment.id));
} catch (IOException ex) {
Log.e(ex);
attachment.available = false;
db.attachment().updateAttachment(attachment);
}
}
}
} else if (DELETE.equals(name))
db.message().setMessageUiHide(message.id, true);
} catch (JSONException ex) {