mirror of https://github.com/M66B/FairEmail.git
Synchronize requires selectable
This commit is contained in:
parent
6fd80ce873
commit
4a332689e9
|
@ -1111,7 +1111,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
||||||
String name = e.getFolder().getFullName();
|
String name = e.getFolder().getFullName();
|
||||||
EntityLog.log(ServiceSynchronize.this, "Folder changed=" + name);
|
EntityLog.log(ServiceSynchronize.this, "Folder changed=" + name);
|
||||||
EntityFolder folder = db.folder().getFolderByName(account.id, name);
|
EntityFolder folder = db.folder().getFolderByName(account.id, name);
|
||||||
if (folder != null)
|
if (folder != null && folder.selectable && folder.synchronize)
|
||||||
EntityOperation.sync(ServiceSynchronize.this, folder.id, false);
|
EntityOperation.sync(ServiceSynchronize.this, folder.id, false);
|
||||||
} finally {
|
} finally {
|
||||||
wlFolder.release();
|
wlFolder.release();
|
||||||
|
@ -1644,7 +1644,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
||||||
if (sync) {
|
if (sync) {
|
||||||
EntityLog.log(this, account.name + " checking folders");
|
EntityLog.log(this, account.name + " checking folders");
|
||||||
for (EntityFolder folder : mapFolders.keySet())
|
for (EntityFolder folder : mapFolders.keySet())
|
||||||
if (folder.synchronize)
|
if (folder.selectable && folder.synchronize)
|
||||||
if (!folder.poll && capIdle) {
|
if (!folder.poll && capIdle) {
|
||||||
// Sends folder NOOP
|
// Sends folder NOOP
|
||||||
if (!mapFolders.get(folder).isOpen())
|
if (!mapFolders.get(folder).isOpen())
|
||||||
|
@ -1798,7 +1798,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
||||||
|
|
||||||
// Close folders
|
// Close folders
|
||||||
for (EntityFolder folder : mapFolders.keySet()) {
|
for (EntityFolder folder : mapFolders.keySet()) {
|
||||||
if (folder.synchronize && !folder.poll && mapFolders.get(folder) != null) {
|
if (folder.selectable && folder.synchronize && !folder.poll && mapFolders.get(folder) != null) {
|
||||||
db.folder().setFolderState(folder.id, "closing");
|
db.folder().setFolderState(folder.id, "closing");
|
||||||
try {
|
try {
|
||||||
if (iservice.getStore().isConnected())
|
if (iservice.getStore().isConnected())
|
||||||
|
|
Loading…
Reference in New Issue