Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-06 12:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move unsent messages to send service, refactoring

Browse Source
This commit is contained in:
M66B
2019-02-27 20:49:49 +00:00
parent 39b4715915
commit 889450d5af
4 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ import androidx.lifecycle.Observer;
import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
public class ServiceSynchronize extends LifecycleService {
private TupleAccountStats lastStats = null;
private TupleAccountStats lastStats = new TupleAccountStats();
private ServiceManager serviceManager = new ServiceManager();
private static final int CONNECT_BACKOFF_START = 8; // seconds
@@ -112,8 +112,6 @@ public class ServiceSynchronize extends LifecycleService {
// builder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
cm.registerNetworkCallback(builder.build(), serviceManager);
JobDaily.schedule(this);
DB db = DB.getInstance(this);
db.account().liveStats().observe(this, new Observer<TupleAccountStats>() {
@@ -130,6 +128,8 @@ public class ServiceSynchronize extends LifecycleService {
Core.notifyMessages(ServiceSynchronize.this, messages);
}
});
JobDaily.schedule(this);
}
@Override
@@ -191,10 +191,8 @@ public class ServiceSynchronize extends LifecycleService {
}
private NotificationCompat.Builder getNotificationService(TupleAccountStats stats) {
if (stats == null)
stats = lastStats;
if (stats == null)
stats = new TupleAccountStats();
if (stats != null)
lastStats = stats;
// Build pending intent
Intent intent = new Intent(this, ServiceUI.class);
@@ -207,7 +205,7 @@ public class ServiceSynchronize extends LifecycleService {
builder
.setSmallIcon(R.drawable.baseline_compare_arrows_white_24)
.setContentTitle(getResources().getQuantityString(
R.plurals.title_notification_synchronizing, stats.accounts, stats.accounts))
R.plurals.title_notification_synchronizing, lastStats.accounts, lastStats.accounts))
.setContentIntent(pi)
.setAutoCancel(false)
.setShowWhen(false)
@@ -215,16 +213,10 @@ public class ServiceSynchronize extends LifecycleService {
.setCategory(Notification.CATEGORY_STATUS)
.setVisibility(NotificationCompat.VISIBILITY_SECRET);
if (stats.operations > 0)
if (lastStats.operations > 0)
builder.setStyle(new NotificationCompat.BigTextStyle().setSummaryText(
getResources().getQuantityString(
R.plurals.title_notification_operations, stats.operations, stats.operations)));
if (stats.unsent > 0)
builder.setContentText(getResources().getQuantityString(
R.plurals.title_notification_unsent, stats.unsent, stats.unsent));
lastStats = stats;
R.plurals.title_notification_operations, lastStats.operations, lastStats.operations)));
return builder;
}