Fixed timing issues

This commit is contained in:
M66B
2019-12-07 20:32:58 +01:00
parent 7f36e108c6
commit 14628c4d22
16 changed files with 232 additions and 130 deletions

View File

@@ -92,27 +92,6 @@ public class EntityOperation {
static final String SEND = "send";
static final String EXISTS = "exists";
void cleanup(Context context) {
DB db = DB.getInstance(context);
if (message != null)
db.message().setMessageUiHide(message, false);
if (EntityOperation.MOVE.equals(name) ||
EntityOperation.ADD.equals(name) ||
EntityOperation.RAW.equals(name))
try {
JSONArray jargs = new JSONArray(args);
long tmpid = jargs.optLong(2, -1);
if (tmpid < 0)
return;
db.message().deleteMessage(tmpid);
} catch (JSONException ex) {
Log.e(ex);
}
}
static void queue(Context context, EntityMessage message, String name, Object... values) {
DB db = DB.getInstance(context);
@@ -316,11 +295,6 @@ public class EntityOperation {
crumb.put("message", Long.toString(op.message));
crumb.put("free", Integer.toString(Log.getFreeMemMb()));
Log.breadcrumb("queued", crumb);
if (SEND.equals(name))
ServiceSend.start(context);
else
ServiceSynchronize.eval(context, false, "operation=" + name);
}
static void queue(Context context, EntityFolder folder, String name, Object... values) {
@@ -379,8 +353,6 @@ public class EntityOperation {
if (folder.account == null) // Outbox
ServiceSend.start(context);
else if (foreground)
ServiceSynchronize.eval(context, false, "sync folder=" + fid);
}
static void subscribe(Context context, long fid, boolean subscribe) {
@@ -403,6 +375,27 @@ public class EntityOperation {
Log.i("Queued subscribe=" + subscribe + " folder=" + folder);
}
void cleanup(Context context) {
DB db = DB.getInstance(context);
if (message != null)
db.message().setMessageUiHide(message, false);
if (EntityOperation.MOVE.equals(name) ||
EntityOperation.ADD.equals(name) ||
EntityOperation.RAW.equals(name))
try {
JSONArray jargs = new JSONArray(args);
long tmpid = jargs.optLong(2, -1);
if (tmpid < 0)
return;
db.message().deleteMessage(tmpid);
} catch (JSONException ex) {
Log.e(ex);
}
}
@Override
public boolean equals(Object obj) {
if (obj instanceof EntityOperation) {