From b682de24c675cf462b96e28d3efd8d107e338a3a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 8 Sep 2018 05:38:46 +0000
Subject: [PATCH] Revert "Remove report error, except when sending messages"

This reverts commit 2423abca98055ea1eef43d6c6a6286f51db11262.
---
 .../java/eu/faircode/email/ServiceSynchronize.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index af75f593..a98cf7f5 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -530,6 +530,7 @@ public class ServiceSynchronize extends LifecycleService {
                                                 EntityOperation.process(ServiceSynchronize.this); // download small attachments
                                             } catch (Throwable ex) {
                                                 Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                                                reportError(account.name, folder.name, ex);
 
                                                 db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
 
@@ -558,6 +559,7 @@ public class ServiceSynchronize extends LifecycleService {
                                                     }
                                             } catch (Throwable ex) {
                                                 Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                                                reportError(account.name, folder.name, ex);
 
                                                 db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
 
@@ -594,6 +596,7 @@ public class ServiceSynchronize extends LifecycleService {
                                                 }
                                             } catch (Throwable ex) {
                                                 Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                                                reportError(account.name, folder.name, ex);
 
                                                 db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
 
@@ -626,6 +629,7 @@ public class ServiceSynchronize extends LifecycleService {
                                 }
                             } catch (Throwable ex) {
                                 Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                                reportError(account.name, folder.name, ex);
 
                                 db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
 
@@ -653,6 +657,7 @@ public class ServiceSynchronize extends LifecycleService {
                                 }
                             } catch (Throwable ex) {
                                 Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                                reportError(account.name, folder.name, ex);
 
                                 db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
 
@@ -717,6 +722,7 @@ public class ServiceSynchronize extends LifecycleService {
 
                                 } catch (Throwable ex) {
                                     Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                                    reportError(account.name, folder.name, ex);
 
                                     db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
                                 } finally {
@@ -770,6 +776,7 @@ public class ServiceSynchronize extends LifecycleService {
                 }
             } catch (Throwable ex) {
                 Log.e(Helper.TAG, account.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                reportError(account.name, null, ex);
                 db.account().setAccountError(account.id, Helper.formatThrowable(ex));
             } finally {
                 // Close store
@@ -1271,6 +1278,7 @@ public class ServiceSynchronize extends LifecycleService {
                     Log.w(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
                 } catch (Throwable ex) {
                     Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
+                    reportError(account.name, folder.name, ex);
 
                     db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
                 }
@@ -1660,7 +1668,7 @@ public class ServiceSynchronize extends LifecycleService {
                             processOperations(outbox, null, null, null);
                         } catch (Throwable ex) {
                             Log.e(Helper.TAG, outbox.name + " " + ex + "\n" + Log.getStackTraceString(ex));
-                            db.folder().setFolderError(outbox.id, Helper.formatThrowable(ex));
+                            reportError(null, outbox.name, ex);
                         } finally {
                             Log.i(Helper.TAG, outbox.name + " end operations");
                             db.folder().setFolderState(outbox.id, null);