From 6ea18cfe99d3b46404a2c36cf5fcd697f1e3afb0 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 23 Apr 2019 20:34:16 +0200 Subject: [PATCH] Revert "Handle subscriptions" This reverts commit d3a761e7290eb249eaca08797898430e10e01e60. --- app/src/main/java/eu/faircode/email/Core.java | 12 +----------- 1 file 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 ff8772f981..094f73b91f 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -704,12 +704,10 @@ class Core { Map> parentFolders = new HashMap<>(); for (Folder ifolder : ifolders) { String fullName = ifolder.getFullName(); - boolean subscribed = ifolder.isSubscribed(); String[] attr = attrs.get(ifolder); String type = EntityFolder.getType(attr, fullName); EntityLog.log(context, account.name + ":" + fullName + - " subscribed=" + subscribed + " attrs=" + TextUtils.join(" ", attr) + " type=" + type); if (type != null) { @@ -726,7 +724,7 @@ class Core { folder.name = fullName; folder.display = display; folder.type = (EntityFolder.SYSTEM.equals(type) ? type : EntityFolder.USER); - folder.synchronize = subscribed; + folder.synchronize = false; folder.poll = ("imap.gmail.com".equals(account.host)); folder.sync_days = EntityFolder.DEFAULT_SYNC; folder.keep_days = EntityFolder.DEFAULT_KEEP; @@ -735,14 +733,6 @@ class Core { } else { Log.i(folder.name + " exists type=" + folder.type); - if (folder.synchronize && !subscribed) - try { - Log.i(folder.name + " subscribe=" + folder.synchronize); - ifolder.setSubscribed(folder.synchronize); - } catch (MessagingException ex) { - Log.w(ex); - } - if (folder.display == null) { if (display != null) { db.folder().setFolderDisplay(folder.id, display);