mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 10:17:18 +00:00
Code Issues Releases Wiki Activity

Fixed race condition

Browse source
This commit is contained in:
M66B 2018-09-30 13:49:01 +00:00
parent 4d5d202ed7
commit e41cc0cccf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View file

@ -214,7 +214,7 @@ public class ServiceSynchronize extends LifecycleService {
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
cm.unregisterNetworkCallback(serviceManager); cm.unregisterNetworkCallback(serviceManager);
serviceManager.stop(); serviceManager.onLost(null);
stopForeground(true); stopForeground(true);
@ -1864,7 +1864,7 @@ public class ServiceSynchronize extends LifecycleService {
if (running) { if (running) {
ConnectivityManager cm = getSystemService(ConnectivityManager.class); ConnectivityManager cm = getSystemService(ConnectivityManager.class);
NetworkInfo ani = cm.getActiveNetworkInfo(); NetworkInfo ani = (network == null ? null : cm.getActiveNetworkInfo());
EntityLog.log(ServiceSynchronize.this, "Network active=" + (ani == null ? null : ani.toString())); EntityLog.log(ServiceSynchronize.this, "Network active=" + (ani == null ? null : ani.toString()));
if (ani == null || !ani.isConnected()) { if (ani == null || !ani.isConnected()) {
EntityLog.log(ServiceSynchronize.this, "Network disconnected=" + ani); EntityLog.log(ServiceSynchronize.this, "Network disconnected=" + ani);