Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 01:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle airplane mode changes

Browse Source
This commit is contained in:
M66B
2019-10-04 17:17:42 +02:00
parent 1c0f5382f5
commit 912c2281d2
2 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,9 +121,12 @@ public class ServiceSynchronize extends ServiceBase {
builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
// Removed because of Android VPN service
// builder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
cm.registerNetworkCallback(builder.build(), onNetworkCallback);
cm.registerNetworkCallback(builder.build(), networkCallback);
registerReceiver(onConnectionChanged, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
IntentFilter iif = new IntentFilter();
iif.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
iif.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
registerReceiver(connectionChangedReceiver, iif);
registerReceiver(onScreenOff, new IntentFilter(Intent.ACTION_SCREEN_OFF));
DB db = DB.getInstance(this);
@@ -284,10 +287,10 @@ public class ServiceSynchronize extends ServiceBase {
EntityLog.log(this, "Service destroy");
unregisterReceiver(onScreenOff);
unregisterReceiver(onConnectionChanged);
unregisterReceiver(connectionChangedReceiver);
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
cm.unregisterNetworkCallback(onNetworkCallback);
cm.unregisterNetworkCallback(networkCallback);
setUnseen(null);
@@ -1302,7 +1305,7 @@ public class ServiceSynchronize extends ServiceBase {
}
}
private ConnectivityManager.NetworkCallback onNetworkCallback = new ConnectivityManager.NetworkCallback() {
private ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
private Boolean lastSuitable = null;
@Override
@@ -1419,12 +1422,19 @@ public class ServiceSynchronize extends ServiceBase {
}
};
private BroadcastReceiver onConnectionChanged = new BroadcastReceiver() {
private BroadcastReceiver connectionChangedReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
EntityLog.log(ServiceSynchronize.this, "Connection intent=" + intent +
EntityLog.log(ServiceSynchronize.this, "Received intent=" + intent +
" " + TextUtils.join(" ", Log.getExtras(intent.getExtras())));
onNetworkCallback.onCapabilitiesChanged(null, null);
if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(intent.getAction())) {
boolean on = intent.getBooleanExtra("state", false);
if (!on)
lastLost = 0;
}
networkCallback.onCapabilitiesChanged(null, null);
}
};