mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Check for raw file, added logging

This commit is contained in:
M66B 2019-09-06 16:45:37 +02:00
parent 301e6c7a53
commit 0566b059e0
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/Core.java
View File

@ -148,7 +148,7 @@ class Core {
Map<String, String> crumb = new HashMap<>();
crumb.put("name", op.name);
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)
crumb.put("message", Long.toString(op.message));
crumb.put("free", Integer.toString(Log.getFreeMemMb()));

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

@ -36,6 +36,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import static androidx.room.ForeignKey.CASCADE;
@ -212,7 +214,8 @@ public class EntityOperation {
// Cross account move
if (!source.account.equals(target.account))
if (message.raw != null && message.raw) {
if (message.raw != null && message.raw &&
message.getRawFile(context).exists()) {
name = ADD;
folder = target.id;
} else
@ -225,18 +228,27 @@ public class EntityOperation {
Log.e(ex);
}
EntityOperation operation = new EntityOperation();
operation.account = message.account;
operation.folder = folder;
operation.message = message.id;
operation.name = name;
operation.args = jargs.toString();
operation.created = new Date().getTime();
operation.id = db.operation().insertOperation(operation);
EntityOperation op = new EntityOperation();
op.account = message.account;
op.folder = folder;
op.message = message.id;
op.name = name;
op.args = jargs.toString();
op.created = new Date().getTime();
op.id = db.operation().insertOperation(op);
Log.i("Queued op=" + operation.id + "/" + operation.name +
" folder=" + operation.folder + " msg=" + operation.message +
" args=" + operation.args);
Log.i("Queued op=" + op.id + "/" + op.name +
" folder=" + op.folder + " msg=" + op.message +
" 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))
ServiceSend.start(context);