Added message count fallback

5 years ago · b4d2f79709
parent bd16ea9204
commit b4d2f79709
1 changed files with 11 additions and 7 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -2286,14 +2286,18 @@ public class MessageHelper {

    static int getMessageCount(Folder folder) throws MessagingException {
        // Keep alive
-        folder.getMessageCount();
-
-        int count = 0;
-        for (Message message : folder.getMessages())
-            if (!message.isExpunged())
-                count++;
+        int total = folder.getMessageCount();
+        try {
+            int count = 0;
+            for (Message message : folder.getMessages())
+                if (!message.isExpunged())
+                    count++;

-        return count;
+            return count;
+        } catch (Throwable ex) {
+            Log.w(ex);
+            return total;
+        }
    }

    static String sanitizeKeyword(String keyword) {