Fix #3186: Remove any prior scheduled or delivered ad grant reminders (…

…#3187)
brave · Jan 12, 2021 · 827b27b · 827b27b
1 parent ab0b0ff
commit 827b27b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Client/Application/Delegates/AppDelegate.swift b/Client/Application/Delegates/AppDelegate.swift
@@ -177,6 +177,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
 
         // Schedule Brave Core Priority Tasks
         self.braveCore?.scheduleLowPriorityStartupTasks()
+        browserViewController.removeScheduledAdGrantReminders()
 
         log.info("startApplication end")
         return true

diff --git a/Client/Frontend/Browser/BrowserViewController/BVC+Rewards.swift b/Client/Frontend/Browser/BrowserViewController/BVC+Rewards.swift
@@ -202,6 +202,21 @@ extension BrowserViewController {
             tabManager.addTabAndSelect(request, isPrivate: isPrivate)
         }
     }
+
+    /// Removes any scheduled or delivered ad grant reminders which may have been added prior to
+    /// removal of those reminders.
+    func removeScheduledAdGrantReminders() {
+        let idPrefix = "rewards.notification.monthly-claim"
+        let center = UNUserNotificationCenter.current()
+        center.getPendingNotificationRequests { requests in
+            let ids = requests
+                .filter { $0.identifier.hasPrefix(idPrefix) }
+                .map(\.identifier)
+            if ids.isEmpty { return }
+            center.removeDeliveredNotifications(withIdentifiers: ids)
+            center.removePendingNotificationRequests(withIdentifiers: ids)
+        }
+    }
 }
 
 extension Tab {