Simplification

4 years ago · 40e19a242c
parent b403f104e4
commit 40e19a242c
1 changed files with 2 additions and 9 deletions
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@ -414,14 +414,6 @@ class Core {
                            continue;
                        }

-                        if (op.tries >= TOTAL_RETRY_MAX) {
-                            // Giving up
-                            op.cleanup(context);
-                            db.operation().deleteOperation(op.id);
-                            ops.remove(op);
-                            continue;
-                        }
-
                        try {
                            db.beginTransaction();

@ -436,7 +428,8 @@ class Core {
                            db.endTransaction();
                        }

-                        if (ex instanceof OutOfMemoryError ||
+                        if (op.tries >= TOTAL_RETRY_MAX ||
+                                ex instanceof OutOfMemoryError ||
                                ex instanceof MessageRemovedException ||
                                ex instanceof MessageRemovedIOException ||
                                ex instanceof FileNotFoundException ||