mirror of https://github.com/M66B/FairEmail.git
Check for raw file, added logging
This commit is contained in:
parent
301e6c7a53
commit
0566b059e0
|
@ -148,7 +148,7 @@ class Core {
|
||||||
Map<String, String> crumb = new HashMap<>();
|
Map<String, String> crumb = new HashMap<>();
|
||||||
crumb.put("name", op.name);
|
crumb.put("name", op.name);
|
||||||
crumb.put("args", op.args);
|
crumb.put("args", op.args);
|
||||||
crumb.put("folder", op.folder + ":" + folder.type);
|
crumb.put("folder", op.account + ":" + op.folder + ":" + folder.type);
|
||||||
if (op.message != null)
|
if (op.message != null)
|
||||||
crumb.put("message", Long.toString(op.message));
|
crumb.put("message", Long.toString(op.message));
|
||||||
crumb.put("free", Integer.toString(Log.getFreeMemMb()));
|
crumb.put("free", Integer.toString(Log.getFreeMemMb()));
|
||||||
|
|
|
@ -36,6 +36,8 @@ import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import static androidx.room.ForeignKey.CASCADE;
|
import static androidx.room.ForeignKey.CASCADE;
|
||||||
|
@ -212,7 +214,8 @@ public class EntityOperation {
|
||||||
|
|
||||||
// Cross account move
|
// Cross account move
|
||||||
if (!source.account.equals(target.account))
|
if (!source.account.equals(target.account))
|
||||||
if (message.raw != null && message.raw) {
|
if (message.raw != null && message.raw &&
|
||||||
|
message.getRawFile(context).exists()) {
|
||||||
name = ADD;
|
name = ADD;
|
||||||
folder = target.id;
|
folder = target.id;
|
||||||
} else
|
} else
|
||||||
|
@ -225,18 +228,27 @@ public class EntityOperation {
|
||||||
Log.e(ex);
|
Log.e(ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
EntityOperation operation = new EntityOperation();
|
EntityOperation op = new EntityOperation();
|
||||||
operation.account = message.account;
|
op.account = message.account;
|
||||||
operation.folder = folder;
|
op.folder = folder;
|
||||||
operation.message = message.id;
|
op.message = message.id;
|
||||||
operation.name = name;
|
op.name = name;
|
||||||
operation.args = jargs.toString();
|
op.args = jargs.toString();
|
||||||
operation.created = new Date().getTime();
|
op.created = new Date().getTime();
|
||||||
operation.id = db.operation().insertOperation(operation);
|
op.id = db.operation().insertOperation(op);
|
||||||
|
|
||||||
Log.i("Queued op=" + operation.id + "/" + operation.name +
|
Log.i("Queued op=" + op.id + "/" + op.name +
|
||||||
" folder=" + operation.folder + " msg=" + operation.message +
|
" folder=" + op.folder + " msg=" + op.message +
|
||||||
" args=" + operation.args);
|
" args=" + op.args);
|
||||||
|
|
||||||
|
Map<String, String> crumb = new HashMap<>();
|
||||||
|
crumb.put("name", op.name);
|
||||||
|
crumb.put("args", op.args);
|
||||||
|
crumb.put("folder", op.account + ":" + op.folder);
|
||||||
|
if (op.message != null)
|
||||||
|
crumb.put("message", Long.toString(op.message));
|
||||||
|
crumb.put("free", Integer.toString(Log.getFreeMemMb()));
|
||||||
|
Log.breadcrumb("queued", crumb);
|
||||||
|
|
||||||
if (SEND.equals(name))
|
if (SEND.equals(name))
|
||||||
ServiceSend.start(context);
|
ServiceSend.start(context);
|
||||||
|
|
Loading…
Reference in New Issue