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

Fixed cancelling quit

This commit is contained in:
M66B 2020-03-21 10:24:43 +01:00
parent 0859a88ee4
commit 206d6e353c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,19 +382,20 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
}
private void quit(final Integer startId) {
if (startId != null && lastOperations > 0)
return;
if (lastQuitId != null && lastQuitId.equals(startId))
return;
lastQuitId = startId;
EntityLog.log(ServiceSynchronize.this,
"Service quit startId=" + startId + " ops=" + lastOperations);
EntityLog.log(ServiceSynchronize.this, "Service quit startId=" + startId);
queue.submit(new Runnable() {
@Override
public void run() {
Log.i("### quit startId=" + startId + "/" + lastQuitId + " ops=" + lastOperations);
if (lastOperations != 0)
return;
Log.i("### quit startId=" + startId);
if (startId == null) {
// Service destroy
@ -411,9 +412,9 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
}
// Stop service
boolean stopped = (lastOperations == 0 && stopSelfResult(startId));
EntityLog.log(ServiceSynchronize.this, "Service quited=" + stopped +
" startId=" + startId + "/" + lastQuitId + " ops=" + lastOperations);
boolean stopped = stopSelfResult(startId);
EntityLog.log(ServiceSynchronize.this,
"Service quited=" + stopped + " startId=" + startId);
}
}
});