818: Also support boosts; rework logging a bit

Author: Lakoja

app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt

@@ -441,22 +441,18 @@ class NotificationsFragment :
     private fun removeDuplicateOlderEntries(positionStart: Int) {
         val dataList = adapter.snapshot().items
 
-        Log.w(TAG, "found elements in adapter "+dataList.size)
-
-        for (pos in dataList.size - 1 downTo  positionStart) {
+        for (pos in dataList.lastIndex downTo  positionStart) {
             val notificationViewData = dataList[pos]
 
             val status = notificationViewData.statusViewData?.status
                 ?: continue
 
             if (!viewModel.hasNewestNotificationId(notificationViewData.type, status.id, notificationViewData.id)) {
-                Log.w(TAG, "Removing old notification at "+pos+" for "+status.id)
+                Log.d(TAG, "Removing old notification at "+pos+" for "+status.id+" at "+status.createdAt)
 
                 adapter.notifyItemRemoved(pos)
             }
         }
-
-        Log.w(TAG, "elements after second "+ adapter.snapshot().size)
     }
 
     override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {

app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt

@@ -485,7 +485,8 @@ class NotificationsViewModel @Inject constructor(
     }
 
     // Status id -> (highest) Notification id
-    val seenFavorites = HashMap<String, String>()
+    private val seenFavorites = HashMap<String, String>()
+    private val seenBoosts = HashMap<String, String>()
 
     private fun getNotifications(
         filters: Set<Notification.Type>,
@@ -498,10 +499,9 @@ class NotificationsViewModel @Inject constructor(
                         ?: return@filter true
 
                     return@filter if (hasNewestNotificationId(notification.type, status.id, notification.id)) {
-                        seenFavorites[status.id] = notification.id // TODO move to hasNewestNotificationId?
-
                         true
                     } else {
+                        Log.d(TAG, "Filtering notification for "+status.id+" at "+status.createdAt)
                         false
                     }
                 }
@@ -517,13 +517,25 @@ class NotificationsViewModel @Inject constructor(
     }
 
     fun hasNewestNotificationId(type: Notification.Type, statusId: String, notificationId: String): Boolean {
-        if (type != Notification.Type.FAVOURITE) {
-            return true
-        }
+        val trackerArray = when(type) {
+            Notification.Type.FAVOURITE -> seenFavorites
+            Notification.Type.REBLOG -> seenBoosts
+            else -> null
+        } ?: return true
+
+        val highestNotificationId = trackerArray[statusId]
 
-        val highestNotificationId = seenFavorites[statusId]
+        return if (highestNotificationId == null || isEqualOrNewer(notificationId, highestNotificationId)) {
+            trackerArray[statusId] = notificationId
 
-        return highestNotificationId == null || isEqualOrNewer(notificationId, highestNotificationId)
+            true
+        } else {
+            // TODO edge case: a newer favorite has been removed: the old notification will not be added again
+            //    (because the removed id is still in the seen array)
+            //    The code could find this out only heuristically: "looking at these notification ids (range), one in the array is not amongst them"
+
+            false
+        }
     }
 
     /**