Add #getFreshNotification() to NotificationPresenter

Author: AChep

project/app/src/main/java/com/achep/acdisplay/notifications/NotificationPresenter.java

@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.service.notification.StatusBarNotification;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -67,6 +68,8 @@ public class NotificationPresenter implements
      */
     private static final boolean FILTER_NOISY_NOTIFICATIONS = true;
 
+    private static final int FRESH_NOTIFICATION_EXPIRY_TIME = 4000; // 4 sec.
+
     public static final int EVENT_BATH = 0;
     public static final int EVENT_POSTED = 1;
     public static final int EVENT_CHANGED = 2;
@@ -468,6 +471,16 @@ private void rebuildLocalList() {
         }
     }
 
+    @Nullable
+    public OpenNotification getFreshNotification() {
+        for (OpenNotification n : getList()) {
+            long delta = Math.max(n.getNotification().priority, 1) * FRESH_NOTIFICATION_EXPIRY_TIME;
+            long past = SystemClock.elapsedRealtime() - delta;
+            if (!n.isRead() && n.getLoadTimestamp() > past) return n;
+        }
+        return null;
+    }
+
     @NonNull
     public ArrayList<OpenNotification> getList() {
         return mLList.list();

project/app/src/main/java/com/achep/acdisplay/notifications/OpenNotification.java

@@ -28,6 +28,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.SystemClock;
 import android.service.notification.StatusBarNotification;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -91,6 +92,7 @@ public static OpenNotification newInstance(@NonNull Notification n) {
     private boolean mEmoticonsEnabled;
     private boolean mMine;
     private boolean mRead;
+    private long mLoadedTimestamp;
     private int mNumber;
 
     // Extracted
@@ -159,6 +161,7 @@ protected OpenNotification(@Nullable StatusBarNotification sbn, @NonNull Notific
     }
 
     public void load(@NonNull Context context) {
+        mLoadedTimestamp = SystemClock.elapsedRealtime();
         mMine = TextUtils.equals(getPackageName(), PackageUtils.getName(context));
         mActions = Action.makeFor(mNotification);
         mNumber = mNotification.number;
@@ -502,6 +505,14 @@ public String getPackageName() {
         return mStatusBarNotification.getPackageName();
     }
 
+    /**
+     * Time since notification has been loaded; in {@link android.os.SystemClock#elapsedRealtime()}
+     * format.
+     */
+    public long getLoadTimestamp() {
+        return mLoadedTimestamp;
+    }
+
     public boolean isGroupChild() {
         return false;
     }

project/app/src/main/java/com/achep/acdisplay/ui/fragments/AcDisplayFragment.java

@@ -1047,6 +1047,23 @@ public boolean isNotDemo() {
 
     //-- NOTIFICATION HANDLING ------------------------------------------------
 
+    @Nullable
+    private NotifyWidget find(@Nullable OpenNotification n) {
+        if (n == null) return null;
+        // Find the widget of this or previous notification,
+        // so we can manage it.
+        for (Widget item : mWidgetsMap.values()) {
+            if (item instanceof NotifyWidget) {
+                // Check if notification has the same key.
+                NotifyWidget nw = (NotifyWidget) item;
+                if (nw.hasIdenticalIds(n)) {
+                    return nw;
+                }
+            }
+        }
+        return null;
+    }
+
     @Override
     public void onNotificationListChanged(@NonNull NotificationPresenter np,
                                           OpenNotification osbn,
@@ -1060,16 +1077,7 @@ public void onNotificationListChanged(@NonNull NotificationPresenter np,
 
             // Find the widget of this or previous notification,
             // so we can manage it.
-            for (Widget item : mWidgetsMap.values()) {
-                if (item instanceof NotifyWidget) {
-                    // Check if notification has the same key.
-                    NotifyWidget nw = (NotifyWidget) item;
-                    if (nw.hasIdenticalIds(osbn)) {
-                        widgetPrev = nw;
-                        break;
-                    }
-                }
-            }
+            widgetPrev = find(osbn);
         }
 
         switch (event) { // don't update on spam-change.