Notifications: refactoring

9 months ago · 9693adfbb4
parent 6bdab773bb
commit 9693adfbb4
3 changed files with 1058 additions and 1029 deletions
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
--- a/app/src/main/java/eu/faircode/email/NotificationHelper.java
+++ b/app/src/main/java/eu/faircode/email/NotificationHelper.java
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@ -811,7 +811,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences

        // New message notifications batching

-        Core.NotificationData notificationData = new Core.NotificationData(this);
+        NotificationHelper.NotificationData notificationData = new NotificationHelper.NotificationData(this);

        MutableLiveData<List<TupleMessageEx>> mutableUnseenNotify = new MutableLiveData<>();
        db.message().liveUnseenNotify().observe(cowner, new Observer<List<TupleMessageEx>>() {
@ -884,7 +884,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                    public void delegate() {
                        try {
                            boolean fg = Boolean.TRUE.equals(foreground.getValue());
-                            Core.notifyMessages(ServiceSynchronize.this, messages, notificationData, fg);
+                            NotificationHelper.notifyMessages(ServiceSynchronize.this, messages, notificationData, fg);
                        } catch (SecurityException ex) {
                            Log.w(ex);
                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this);