From c37d21204239197aacaaa6731d4482274b1060b3 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 22 Apr 2020 08:46:18 +0200 Subject: [PATCH] Revert "Check if folders are actually alive" This reverts commit 72ede04868ed03aa3be99dd7b4cecc9cee606826. --- app/src/main/java/eu/faircode/email/Core.java | 10 ---------- .../java/eu/faircode/email/ServiceSynchronize.java | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 10fd7fb401..ecef22bb2d 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -586,16 +586,6 @@ class Core { }); } - static boolean isAlive(IMAPFolder ifolder) { - try { - noop(ifolder); - } catch (MessagingException ex) { - Log.i(ifolder.getFullName(), ex); - return false; - } - return true; - } - private static void onSeen(Context context, JSONArray jargs, EntityFolder folder, EntityMessage message, IMAPFolder ifolder) throws MessagingException, JSONException { // Mark message (un)seen DB db = DB.getInstance(context); diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 2fb1a16358..b0cc78a11a 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1348,7 +1348,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences if (folder.synchronize) if (!folder.poll && capIdle) { // Sends folder NOOP - if (!Core.isAlive(mapFolders.get(folder))) + if (!mapFolders.get(folder).isOpen()) throw new StoreClosedException(iservice.getStore(), folder.name); } else { if (folder.poll_count == 0)