mirror of
https://github.com/M66B/FairEmail.git
synced 2025-02-22 14:11:00 +00:00
Synchronize reload
This commit is contained in:
parent
adfa3c8298
commit
0aed1c3957
1 changed files with 43 additions and 25 deletions
|
@ -332,7 +332,7 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "reload":
|
case "reload":
|
||||||
serviceManager.queue_reload(true, intent.getStringExtra("reason"));
|
serviceManager.service_reload(intent.getStringExtra("reason"));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "clear":
|
case "clear":
|
||||||
|
@ -2545,41 +2545,47 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onAvailable(Network network) {
|
public void onAvailable(Network network) {
|
||||||
try {
|
synchronized (queue) {
|
||||||
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
|
try {
|
||||||
EntityLog.log(ServiceSynchronize.this, "Available " + network + " " + cm.getNetworkInfo(network));
|
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||||
|
EntityLog.log(ServiceSynchronize.this, "Available " + network + " " + cm.getNetworkInfo(network));
|
||||||
|
|
||||||
if (!started && suitableNetwork())
|
if (!started && suitableNetwork())
|
||||||
queue_reload(true, "connect " + network);
|
queue_reload(true, "connect " + network);
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.e(ex);
|
Log.e(ex);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCapabilitiesChanged(Network network, NetworkCapabilities capabilities) {
|
public void onCapabilitiesChanged(Network network, NetworkCapabilities capabilities) {
|
||||||
try {
|
synchronized (queue) {
|
||||||
if (!started) {
|
try {
|
||||||
EntityLog.log(ServiceSynchronize.this, "Network " + network + " capabilities " + capabilities);
|
if (!started) {
|
||||||
if (suitableNetwork())
|
EntityLog.log(ServiceSynchronize.this, "Network " + network + " capabilities " + capabilities);
|
||||||
queue_reload(true, "connect " + network);
|
if (suitableNetwork())
|
||||||
|
queue_reload(true, "connect " + network);
|
||||||
|
}
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
Log.e(ex);
|
||||||
}
|
}
|
||||||
} catch (Throwable ex) {
|
|
||||||
Log.e(ex);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLost(Network network) {
|
public void onLost(Network network) {
|
||||||
try {
|
synchronized (queue) {
|
||||||
EntityLog.log(ServiceSynchronize.this, "Lost " + network);
|
try {
|
||||||
|
EntityLog.log(ServiceSynchronize.this, "Lost " + network);
|
||||||
|
|
||||||
if (started && !suitableNetwork()) {
|
if (started && !suitableNetwork()) {
|
||||||
lastLost = new Date().getTime();
|
lastLost = new Date().getTime();
|
||||||
queue_reload(false, "disconnect " + network);
|
queue_reload(false, "disconnect " + network);
|
||||||
|
}
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
Log.e(ex);
|
||||||
}
|
}
|
||||||
} catch (Throwable ex) {
|
|
||||||
Log.e(ex);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2606,10 +2612,22 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
EntityLog.log(ServiceSynchronize.this, "Service init");
|
EntityLog.log(ServiceSynchronize.this, "Service init");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void service_reload(String reason) {
|
||||||
|
synchronized (queue) {
|
||||||
|
try {
|
||||||
|
serviceManager.queue_reload(true, reason);
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
Log.e(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void service_destroy() {
|
private void service_destroy() {
|
||||||
EntityLog.log(ServiceSynchronize.this, "Service destroy");
|
synchronized (queue) {
|
||||||
if (started)
|
EntityLog.log(ServiceSynchronize.this, "Service destroy");
|
||||||
queue_reload(false, "service destroy");
|
if (started)
|
||||||
|
queue_reload(false, "service destroy");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void start() {
|
private void start() {
|
||||||
|
|
Loading…
Reference in a new issue