Bug 1822899 - Limit Nimbus message display count to max display count

2 years ago · 126591afd6
parent b1ad36df71
commit 126591afd6
2 changed files with 8 additions and 1 deletions
--- a/app/src/main/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorage.kt
+++ b/app/src/main/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorage.kt
@ -78,7 +78,7 @@ class NimbusMessagingStorage(
                        ?: return@mapNotNull null,
                )
            }.filter {
-                it.maxDisplayCount >= it.metadata.displayCount &&
+                !it.isExpired &&
                    !it.metadata.dismissed &&
                    !it.metadata.pressed
            }.sortedByDescending {
--- a/app/src/test/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorageTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/gleanplumb/NimbusMessagingStorageTest.kt
@ -193,12 +193,19 @@ class NimbusMessagingStorageTest {
                    id = "shown-many-times-message",
                    displayCount = 10,
                ),
+                "shown-two-times-message" to Message.Metadata(
+                    id = "shown-two-times-message",
+                    displayCount = 2,
+                ),
                "normal-message" to Message.Metadata(id = "normal-message", displayCount = 0),
            )
            val messages = mapOf(
                "shown-many-times-message" to createMessageData(
                    style = "high-priority",
                ),
+                "shown-two-times-message" to createMessageData(
+                    style = "high-priority",
+                ),
                "normal-message" to createMessageData(style = "high-priority"),
            )
            val styles = mapOf(