mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 17:27:00 +00:00
Code Issues Releases Wiki Activity

Fixed default operation actions

Browse source
This commit is contained in:
M66B 2018-12-10 18:44:45 +01:00
parent d912aab5dc
commit 8f6032f12a
1 changed files with 41 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
app/src/main/java/eu/faircode/email/EntityOperation.java
View file

@ -22,6 +22,7 @@ package eu.faircode.email;
import android.util.Log; import android.util.Log;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException;
import java.util.Date; import java.util.Date;
@ -75,52 +76,66 @@ public class EntityOperation {
static void queue(DB db, EntityMessage message, String name) { static void queue(DB db, EntityMessage message, String name) {
JSONArray jargs = new JSONArray(); JSONArray jargs = new JSONArray();
queue(db, message.folder, message.id, name, jargs); queue(db, message, name, jargs);
} }
static void queue(DB db, EntityMessage message, String name, Object value) { static void queue(DB db, EntityMessage message, String name, Object value) {
JSONArray jargs = new JSONArray(); JSONArray jargs = new JSONArray();
jargs.put(value); jargs.put(value);
queue(db, message.folder, message.id, name, jargs); queue(db, message, name, jargs);
if (SEEN.equals(name)) {
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
db.message().setMessageUiSeen(similar.id, (boolean) value);
db.message().setMessageUiIgnored(similar.id, true);
}
} else if (FLAG.equals(name))
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid))
db.message().setMessageUiFlagged(similar.id, (boolean) value);
else if (ANSWERED.equals(name))
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid))
db.message().setMessageUiAnswered(similar.id, (boolean) value);
else if (MOVE.equals(name))
db.message().setMessageUiHide(message.id, true);
else if (DELETE.equals(name))
db.message().setMessageUiHide(message.id, true);
} }
static void queue(DB db, EntityMessage message, String name, Object value1, Object value2) { static void queue(DB db, EntityMessage message, String name, Object value1, Object value2) {
JSONArray jargs = new JSONArray(); JSONArray jargs = new JSONArray();
jargs.put(value1); jargs.put(value1);
jargs.put(value2); jargs.put(value2);
queue(db, message.folder, message.id, name, jargs); queue(db, message, name, jargs);
} }
static void sync(DB db, long folder) { static void sync(DB db, long folder) {
if (db.operation().getOperationCount(folder, EntityOperation.SYNC) == 0) { if (db.operation().getOperationCount(folder, EntityOperation.SYNC) == 0) {
queue(db, folder, null, EntityOperation.SYNC, new JSONArray()); EntityOperation operation = new EntityOperation();
operation.folder = folder;
operation.message = null;
operation.name = SYNC;
operation.args = new JSONArray().toString();
operation.created = new Date().getTime();
operation.id = db.operation().insertOperation(operation);
db.folder().setFolderSyncState(folder, "requested"); db.folder().setFolderSyncState(folder, "requested");
Log.i(Helper.TAG, "Queued sync folder=" + folder);
} }
} }
private static void queue(DB db, long folder, Long message, String name, JSONArray jargs) { private static void queue(DB db, EntityMessage message, String name, JSONArray jargs) {
try {
if (SEEN.equals(name)) {
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
db.message().setMessageUiSeen(similar.id, jargs.getBoolean(0));
db.message().setMessageUiIgnored(similar.id, true);
}
} else if (FLAG.equals(name))
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid))
db.message().setMessageUiFlagged(similar.id, jargs.getBoolean(0));
else if (ANSWERED.equals(name))
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid))
db.message().setMessageUiAnswered(similar.id, jargs.getBoolean(0));
else if (MOVE.equals(name))
db.message().setMessageUiHide(message.id, true);
else if (DELETE.equals(name))
db.message().setMessageUiHide(message.id, true);
} catch (JSONException ex) {
Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
}
EntityOperation operation = new EntityOperation(); EntityOperation operation = new EntityOperation();
operation.folder = folder; operation.folder = message.folder;
operation.message = message; operation.message = message.id;
operation.name = name; operation.name = name;
operation.args = jargs.toString(); operation.args = jargs.toString();
operation.created = new Date().getTime(); operation.created = new Date().getTime();