Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34555e20 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Do not increment the conversation unread count when... 

Merge "Do not increment the conversation unread count when FLAG_ONLY_ALERT_ONCE is set." into sc-dev
parents 4e57531e 5c64d007

packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt

+9 −4
Original line number Diff line number Diff line
@@ -218,13 +218,18 @@ class ConversationNotificationManager @Inject constructor( 
        })

    }



    private fun ConversationState.shouldIncrementUnread(newBuilder: Notification.Builder) =

            if (notification.flags and Notification.FLAG_ONLY_ALERT_ONCE != 0) {

                false

            } else {

                val oldBuilder = Notification.Builder.recoverBuilder(context, notification)

                Notification.areStyledNotificationsVisiblyDifferent(oldBuilder, newBuilder)

            }



    fun getUnreadCount(entry: NotificationEntry, recoveredBuilder: Notification.Builder): Int =

            states.compute(entry.key) { _, state ->

                val newCount = state?.run {

                    val old = Notification.Builder.recoverBuilder(context, notification)

                    val increment = Notification

                            .areStyledNotificationsVisiblyDifferent(old, recoveredBuilder)

                    if (increment) unreadCount + 1 else unreadCount

                    if (shouldIncrementUnread(recoveredBuilder)) unreadCount + 1 else unreadCount

                } ?: 1

                ConversationState(newCount, entry.sbn.notification)

            }!!.unreadCount