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

Show waiting for suitable connection in synchronizing notification

This commit is contained in:
M66B 2019-07-29 12:01:13 +02:00
parent ed35dddceb
commit 78e9ed5dd9
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,6 +324,9 @@ public class ServiceSynchronize extends ServiceBase {
builder.setContentText(getResources().getQuantityString(
R.plurals.title_notification_operations, lastStats.operations, lastStats.operations));
if (!networkState.isSuitable())
builder.setSubText(getString(R.string.title_notification_waiting));
return builder;
}
@ -1301,9 +1304,12 @@ public class ServiceSynchronize extends ServiceBase {
}
private ConnectivityManager.NetworkCallback onNetworkCallback = new ConnectivityManager.NetworkCallback() {
private Boolean lastSuitable = null;
@Override
public void onAvailable(Network network) {
networkState.update(ConnectionHelper.getNetworkState(ServiceSynchronize.this));
updateNotification();
synchronized (ServiceSynchronize.this) {
try {
@ -1359,6 +1365,7 @@ public class ServiceSynchronize extends ServiceBase {
@Override
public void onCapabilitiesChanged(Network network, NetworkCapabilities capabilities) {
networkState.update(ConnectionHelper.getNetworkState(ServiceSynchronize.this));
updateNotification();
synchronized (ServiceSynchronize.this) {
try {
@ -1376,6 +1383,7 @@ public class ServiceSynchronize extends ServiceBase {
@Override
public void onLost(Network network) {
networkState.update(ConnectionHelper.getNetworkState(ServiceSynchronize.this));
updateNotification();
synchronized (ServiceSynchronize.this) {
try {
@ -1390,6 +1398,14 @@ public class ServiceSynchronize extends ServiceBase {
}
}
}
private void updateNotification() {
if (lastSuitable == null || lastSuitable != networkState.isSuitable()) {
lastSuitable = networkState.isSuitable();
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.notify(Helper.NOTIFICATION_SYNCHRONIZE, getNotificationService(lastStats).build());
}
}
};
private BroadcastReceiver onScreenOff = new BroadcastReceiver() {