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

Connect to folder on sync only

This commit is contained in:
M66B 2019-08-24 15:39:59 +02:00
parent 7011600f3a
commit f3b828a00c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -98,7 +98,6 @@ public class ServiceSynchronize extends ServiceBase {
private TupleAccountStats lastStats = new TupleAccountStats(); private TupleAccountStats lastStats = new TupleAccountStats();
private ExecutorService queue = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory); private ExecutorService queue = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
private static boolean booted = false;
private static boolean sync = true; private static boolean sync = true;
private static boolean oneshot = false; private static boolean oneshot = false;
@ -826,7 +825,7 @@ public class ServiceSynchronize extends ServiceBase {
}); });
for (final EntityFolder folder : folders) { for (final EntityFolder folder : folders) {
if (folder.synchronize && !folder.poll && capIdle) { if (folder.synchronize && !folder.poll && capIdle && sync) {
Log.i(account.name + " sync folder " + folder.name); Log.i(account.name + " sync folder " + folder.name);
db.folder().setFolderState(folder.id, "connecting"); db.folder().setFolderState(folder.id, "connecting");
@ -1186,7 +1185,7 @@ public class ServiceSynchronize extends ServiceBase {
throw new StoreClosedException(iservice.getStore(), "NOOP"); throw new StoreClosedException(iservice.getStore(), "NOOP");
for (EntityFolder folder : mapFolders.keySet()) for (EntityFolder folder : mapFolders.keySet())
if (folder.synchronize) if (folder.synchronize && mapFolders.get(folder) != null)
if (!folder.poll && capIdle) { if (!folder.poll && capIdle) {
// Sends folder NOOP // Sends folder NOOP
if (!mapFolders.get(folder).isOpen()) if (!mapFolders.get(folder).isOpen())
@ -1256,7 +1255,7 @@ public class ServiceSynchronize extends ServiceBase {
EntityLog.log(this, account.name + " closing"); EntityLog.log(this, account.name + " closing");
db.account().setAccountState(account.id, "closing"); db.account().setAccountState(account.id, "closing");
for (EntityFolder folder : mapFolders.keySet()) for (EntityFolder folder : mapFolders.keySet())
if (folder.synchronize && !folder.poll) if (folder.synchronize && !folder.poll && mapFolders.get(folder) != null)
db.folder().setFolderState(folder.id, "closing"); db.folder().setFolderState(folder.id, "closing");
// Close store // Close store
@ -1278,7 +1277,7 @@ public class ServiceSynchronize extends ServiceBase {
// Update state // Update state
for (EntityFolder folder : mapFolders.keySet()) for (EntityFolder folder : mapFolders.keySet())
if (folder.synchronize && !folder.poll) if (folder.synchronize && !folder.poll && mapFolders.get(folder) != null)
db.folder().setFolderState(folder.id, null); db.folder().setFolderState(folder.id, null);
} }
@ -1582,7 +1581,7 @@ public class ServiceSynchronize extends ServiceBase {
int pollInterval = prefs.getInt("poll_interval", 0); int pollInterval = prefs.getInt("poll_interval", 0);
if (!enabled || pollInterval > 0) { if (!enabled || pollInterval > 0) {
ServiceSynchronize.sync = true; ServiceSynchronize.sync = true;
oneshot = true; ServiceSynchronize.oneshot = true;
} }
ContextCompat.startForegroundService(context, ContextCompat.startForegroundService(context,
new Intent(context, ServiceSynchronize.class) new Intent(context, ServiceSynchronize.class)
@ -1595,7 +1594,7 @@ public class ServiceSynchronize extends ServiceBase {
int pollInterval = prefs.getInt("poll_interval", 0); int pollInterval = prefs.getInt("poll_interval", 0);
if (!enabled || pollInterval > 0) { if (!enabled || pollInterval > 0) {
ServiceSynchronize.sync = sync; ServiceSynchronize.sync = sync;
oneshot = true; ServiceSynchronize.oneshot = true;
ContextCompat.startForegroundService(context, ContextCompat.startForegroundService(context,
new Intent(context, ServiceSynchronize.class) new Intent(context, ServiceSynchronize.class)
.setAction("oneshot_start")); .setAction("oneshot_start"));