From d838bad9f907de5fe6cbf21869d54b1beaf4a791 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 16 Nov 2020 09:53:22 +0100
Subject: [PATCH] Sync subscribed requires subscriptions

---
 app/src/main/java/eu/faircode/email/Core.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 6c30465fd7..d9f414f332 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1529,6 +1529,7 @@ class Core {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean sync_folders = (prefs.getBoolean("sync_folders", true) || force);
         boolean sync_shared_folders = prefs.getBoolean("sync_shared_folders", false);
+        boolean subscriptions = prefs.getBoolean("subscriptions", false);
         boolean sync_subscribed = prefs.getBoolean("sync_subscribed", false);
 
         // Get folder names
@@ -1710,7 +1711,7 @@ class Core {
                         folder.account = account.id;
                         folder.name = fullName;
                         folder.type = (EntityFolder.SYSTEM.equals(type) ? type : EntityFolder.USER);
-                        folder.synchronize = (subscribed && sync_subscribed);
+                        folder.synchronize = (subscribed && subscriptions && sync_subscribed);
                         folder.subscribed = subscribed;
                         folder.poll = true;
                         folder.sync_days = EntityFolder.DEFAULT_SYNC;