mirror of https://github.com/M66B/FairEmail.git
Force sync implies sync
This commit is contained in:
parent
5a93ac6fb4
commit
7eaa058e96
|
@ -254,12 +254,14 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
|||
|
||||
boolean sync = current.command.getBoolean("sync", false);
|
||||
boolean force = current.command.getBoolean("force", false);
|
||||
if (force)
|
||||
sync = true;
|
||||
|
||||
int index = accountStates.indexOf(current);
|
||||
if (index < 0) {
|
||||
if (current.canRun()) {
|
||||
if (current.canRun(force)) {
|
||||
EntityLog.log(ServiceSynchronize.this, "### new " + current +
|
||||
" start=" + current.canRun() +
|
||||
" start=" + current.canRun(force) +
|
||||
" sync=" + current.accountState.isEnabled(current.enabled) +
|
||||
" enabled=" + current.accountState.synchronize +
|
||||
" ondemand=" + current.accountState.ondemand +
|
||||
|
@ -289,14 +291,14 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
|||
// Some networks disallow email server connections:
|
||||
// - reload on network type change when disconnected
|
||||
if (reload ||
|
||||
prev.canRun() != current.canRun() ||
|
||||
prev.canRun(force) != current.canRun(force) ||
|
||||
!prev.accountState.equals(current.accountState)) {
|
||||
if (prev.canRun() || current.canRun())
|
||||
if (prev.canRun(force) || current.canRun(force))
|
||||
EntityLog.log(ServiceSynchronize.this, "### changed " + current +
|
||||
" reload=" + reload +
|
||||
" force=" + force +
|
||||
" stop=" + prev.canRun() +
|
||||
" start=" + current.canRun() +
|
||||
" stop=" + prev.canRun(force) +
|
||||
" start=" + current.canRun(force) +
|
||||
" sync=" + sync +
|
||||
" enabled=" + current.accountState.isEnabled(current.enabled) +
|
||||
" should=" + current.accountState.shouldRun(current.enabled) +
|
||||
|
@ -308,11 +310,11 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
|||
" tbd=" + current.accountState.tbd +
|
||||
" state=" + current.accountState.state +
|
||||
" active=" + prev.networkState.getActive() + "/" + current.networkState.getActive());
|
||||
if (prev.canRun()) {
|
||||
if (prev.canRun(force)) {
|
||||
event = true;
|
||||
stop(prev);
|
||||
}
|
||||
if (current.canRun()) {
|
||||
if (current.canRun(force)) {
|
||||
event = true;
|
||||
start(current, current.accountState.isEnabled(current.enabled) || sync, force);
|
||||
}
|
||||
|
@ -2152,7 +2154,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
|||
EntityLog.log(ServiceSynchronize.this, "### command " +
|
||||
TextUtils.join(" ", Log.getExtras(command)));
|
||||
|
||||
if (command.getBoolean("sync"))
|
||||
if (command.getBoolean("sync") || command.getBoolean("force"))
|
||||
lastNetworkState = ConnectionHelper.getNetworkState(ServiceSynchronize.this);
|
||||
|
||||
post(command, lastNetworkState, lastAccountStates);
|
||||
|
|
|
@ -44,8 +44,8 @@ public class TupleAccountNetworkState {
|
|||
this.accountState = accountState;
|
||||
}
|
||||
|
||||
public boolean canRun() {
|
||||
return (this.networkState.isSuitable() && this.accountState.shouldRun(enabled));
|
||||
public boolean canRun(boolean force) {
|
||||
return (this.networkState.isSuitable() && this.accountState.shouldRun(enabled || force));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue