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

Cancel transient sync operations

This commit is contained in:
M66B 2020-03-03 19:25:42 +01:00
parent 9731e17af8
commit 9088dc1f5b
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/DaoOperation.java
View File

@ -139,4 +139,7 @@ public interface DaoOperation {
@Query("DELETE FROM operation WHERE id = :id") @Query("DELETE FROM operation WHERE id = :id")
int deleteOperation(long id); int deleteOperation(long id);
@Query("DELETE FROM operation WHERE account = :account AND name = :name")
int deleteOperations(long account, String name);
} }

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

@ -1529,19 +1529,13 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
Log.w(account.name + " backoff " + ex.toString()); Log.w(account.name + " backoff " + ex.toString());
} }
} else { } else {
// Stop retrying when on manual sync // Cancel transient sync operations
if (account.ondemand)
break;
// Stop retrying when executing operations only
boolean enabled = prefs.getBoolean("enabled", true); boolean enabled = prefs.getBoolean("enabled", true);
if (!enabled)
break;
// Stop retrying when polling
int pollInterval = prefs.getInt("poll_interval", DEFAULT_POLL_INTERVAL); int pollInterval = prefs.getInt("poll_interval", DEFAULT_POLL_INTERVAL);
if (pollInterval > 0 && !account.poll_exempted) if (!enabled || account.ondemand || (pollInterval > 0 && !account.poll_exempted)) {
break; int syncs = db.operation().deleteOperations(account.id, EntityOperation.SYNC);
Log.i(account.name + " cancelled syncs=" + syncs);
}
// Long back-off period, let device sleep // Long back-off period, let device sleep
Intent intent = new Intent(ServiceSynchronize.this, ServiceSynchronize.class); Intent intent = new Intent(ServiceSynchronize.this, ServiceSynchronize.class);