From ef582f3e99e2da6159aa1f537183a5e6f73114ec Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 4 Feb 2019 10:19:17 +0000
Subject: [PATCH] Improved folder synchronization

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java |  2 +-
 .../java/eu/faircode/email/ServiceSynchronize.java     | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index cbde79e8fe..3e8959e7d4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -118,7 +118,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         }
 
         private void bindTo(TupleFolderEx folder) {
-            itemView.setActivated(folder.tbd != null);
+            itemView.setActivated(folder.tbc != null || folder.tbd != null);
             itemView.setAlpha(folder.hide ? 0.5f : 1.0f);
 
             if (textSize != 0)
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 648a2d886d..c70465ce4c 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2193,14 +2193,10 @@ public class ServiceSynchronize extends LifecycleService {
                 if (folder.tbc != null) {
                     Log.i(folder.name + " creating");
                     IMAPFolder ifolder = (IMAPFolder) istore.getFolder(folder.name);
-                    try {
+                    if (!ifolder.exists())
                         ifolder.create(Folder.HOLDS_MESSAGES);
-                        db.folder().resetFolderTbc(folder.id);
-                    } catch (Throwable ex) {
-                        reportError(account, folder, ex);
-                        db.folder().deleteFolder(folder.id);
-                    }
-                } else if (folder.tbd != null) {
+                    db.folder().resetFolderTbc(folder.id);
+                } else if (folder.tbd != null && folder.tbd) {
                     Log.i(folder.name + " deleting");
                     IMAPFolder ifolder = (IMAPFolder) istore.getFolder(folder.name);
                     if (ifolder.exists())