mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent syncing folder list for non selectable folders

This commit is contained in:
M66B 2021-02-25 12:31:34 +01:00
parent 043220ec79
commit 305456919a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/Core.java
View File

@ -1708,9 +1708,12 @@ class Core {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean sync_folders = (prefs.getBoolean("sync_folders", true) || force); boolean sync_folders = prefs.getBoolean("sync_folders", true);
boolean sync_shared_folders = prefs.getBoolean("sync_shared_folders", false); boolean sync_shared_folders = prefs.getBoolean("sync_shared_folders", false);
boolean subscriptions = prefs.getBoolean("subscriptions", false); Log.i(account.name + " sync folders=" + sync_folders + " shared=" + sync_shared_folders + " force=" + force);
if (force)
sync_folders = true;
// Get folder names // Get folder names
boolean drafts = false; boolean drafts = false;
@ -1777,7 +1780,7 @@ class Core {
} }
} else { } else {
local.put(folder.name, folder); local.put(folder.name, folder);
if (folder.synchronize && folder.initialize != 0) if (folder.selectable && folder.synchronize && folder.initialize != 0)
sync_folders = true; sync_folders = true;
} }
} }
@ -1929,7 +1932,7 @@ class Core {
folder.setProperties(); folder.setProperties();
folder.setSpecials(account); folder.setSpecials(account);
if (parent != null && EntityFolder.USER.equals(parent.type)) { if (selectable && parent != null && EntityFolder.USER.equals(parent.type)) {
folder.synchronize = parent.synchronize; folder.synchronize = parent.synchronize;
folder.poll = parent.poll; folder.poll = parent.poll;
folder.poll_factor = parent.poll_factor; folder.poll_factor = parent.poll_factor;