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

Simplify manual sync

Browse Source
This commit is contained in:
M66B
2019-02-28 19:17:09 +00:00
parent faab364d1a
commit 21106ad0fd
8 changed files with 37 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/ServiceSend.java
View File

@@ -26,7 +26,6 @@ import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.os.PowerManager;
import android.text.TextUtils;
@@ -139,23 +138,17 @@ public class ServiceSend extends LifecycleService {
@Override
public void onAvailable(Network network) {
Log.i("Service send available=" + network);
if (isConnected())
if (Helper.isConnected(ServiceSend.this))
run();
}
@Override
public void onCapabilitiesChanged(Network network, NetworkCapabilities caps) {
Log.i("Service send caps=" + caps);
if (isConnected())
if (Helper.isConnected(ServiceSend.this))
run();
}
private boolean isConnected() {
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo ni = cm.getActiveNetworkInfo();
return (ni != null && ni.isConnected());
}
private void run() {
if (thread != null && thread.isAlive())
return;
@@ -218,7 +211,7 @@ public class ServiceSend extends LifecycleService {
Log.i(outbox.name + " end op=" + op.id + "/" + op.name);
}
if (!isConnected())
if (!Helper.isConnected(ServiceSend.this))
break;
}