Ref #2151: At least one notification must show before we lock showing…

… subsequent notifications.
brave · Jan 23, 2020 · 9a31443 · 9a31443
1 parent 8da88e8
commit 9a31443
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Client/Application/ClientPreferences.swift b/Client/Application/ClientPreferences.swift
@@ -104,6 +104,10 @@ extension Preferences {
         /// Whether the iOS keyboard auto-opens on a NTP or not
         static let autoOpenKeyboard = Option<Bool>(key: "newtabpage.auto-open-keyboard", default: false)
 
+        /// At least one notification must show before we lock showing subsequent notifications.
+        static let atleastOneNTPNotificationWasShowed = Option<Bool>(key: "newtabpage.one-notificaiton-showed",
+                                                                     default: false)
+
         /// Whether the callout to use branded image was shown.
         static let brandedImageShowed = Option<Bool>(key: "newtabpage.branded-image-callout-showed",
                                                      default: false)

diff --git a/Client/Frontend/Browser/HomePanel/FavoritesViewController.swift b/Client/Frontend/Browser/HomePanel/FavoritesViewController.swift
@@ -181,8 +181,11 @@ class FavoritesViewController: UIViewController, Themeable {
             $0.removeObserver(self, name: .privacyModeChanged, object: nil)
         }
 
-        // Navigating away from NTP counts the current notification as showed.
-        Preferences.NewTabPage.brandedImageShowed.value = true
+
+        if Preferences.NewTabPage.atleastOneNTPNotificationWasShowed.value {
+            // Navigating away from NTP counts the current notification as showed.
+            Preferences.NewTabPage.brandedImageShowed.value = true
+        }
     }
 
     override func viewDidLoad() {
@@ -297,6 +300,7 @@ class FavoritesViewController: UIViewController, Themeable {
             }
 
             vc = notificationVC
+            Preferences.NewTabPage.atleastOneNTPNotificationWasShowed.value = true
         case .claimRewards:
             if !Preferences.NewTabPage.attemptToShowClaimRewardsNotification.value { return }