Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-19 23:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved operation errors

Browse Source
This commit is contained in:
M66B
2021-04-30 19:45:20 +02:00
parent 1c797f5f6c
commit fcc893627e
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,6 +185,9 @@ class Core {
DB db = DB.getInstance(context);
NotificationManager nm =
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
int retry = 0;
boolean group = true;
Log.i(folder.name + " executing operations=" + ops.size());
@@ -202,6 +205,10 @@ class Core {
" group=" + group +
" retry=" + retry);
if (EntityOperation.HEADERS.equals(op.name) ||
EntityOperation.RAW.equals(op.name))
nm.cancel(op.name + ":" + op.message, 1);
if (!Objects.equals(folder.id, op.folder))
throw new IllegalArgumentException("Invalid folder=" + folder.id + "/" + op.folder);
@@ -487,6 +494,7 @@ class Core {
if (message != null &&
!EntityOperation.FETCH.equals(op.name) &&
!EntityOperation.ATTACHMENT.equals(op.name) &&
!(ex instanceof IllegalArgumentException))
db.message().setMessageError(message.id, op.error);
@@ -512,6 +520,8 @@ class Core {
(ex.getCause() instanceof BadCommandException ||
ex.getCause() instanceof CommandFailedException /* NO */)) ||
MessageHelper.isRemoved(ex) ||
EntityOperation.HEADERS.equals(op.name) ||
EntityOperation.RAW.equals(op.name) ||
EntityOperation.ATTACHMENT.equals(op.name) ||
(EntityOperation.ADD.equals(op.name) &&
EntityFolder.DRAFTS.equals(folder.type))) {
@@ -599,6 +609,18 @@ class Core {
}
ops.remove(op);
int resid = context.getResources().getIdentifier(
"title_op_title_" + op.name,
"string",
context.getPackageName());
String title = (resid == 0 ? null : context.getString(resid));
if (title != null) {
NotificationCompat.Builder builder =
getNotificationError(context, "warning", title, ex);
nm.notify(op.name + ":" + op.message, 1, builder.build());
}
} else {
retry++;
if (retry < LOCAL_RETRY_MAX &&

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

@@ -511,7 +511,9 @@ public class EntityOperation {
if (EntityOperation.ATTACHMENT.equals(name))
try {
JSONArray jargs = new JSONArray(args);
db.attachment().setProgress(jargs.getLong(0), null);
long id = jargs.getLong(0);
db.attachment().setProgress(id, null);
db.attachment().setError(id, error);
return;
} catch (JSONException ex) {
Log.e(ex);