Always check to make sure that only one Bulletin is open at a time

Fixes #330 - "Attempt to present a Bulletin on top of another Bulletin window"
OneBusAway · Aug 21, 2021 · 69819e8 · 69819e8
1 parent 83ed144
commit 69819e8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/OBAKit/Alerts/AgencyAlertBulletin.swift b/OBAKit/Alerts/AgencyAlertBulletin.swift
@@ -50,6 +50,10 @@ class AgencyAlertBulletin: NSObject {
     }
 
     func show(in application: UIApplication) {
+        guard !bulletinManager.isShowingBulletin else {
+            return
+        }
+
         bulletinManager.showBulletin(in: application)
     }
 }
diff --git a/OBAKit/Errors/ErrorBulletin.swift b/OBAKit/Errors/ErrorBulletin.swift
@@ -42,6 +42,10 @@ class ErrorBulletin: NSObject {
     }
 
     func show(in app: UIApplication) {
+        guard !bulletinManager.isShowingBulletin else {
+            return
+        }
+
         bulletinManager.showBulletin(in: app)
     }
 }
diff --git a/OBAKit/PushNotifications/AlarmBuilder.swift b/OBAKit/PushNotifications/AlarmBuilder.swift
@@ -76,6 +76,10 @@ class AlarmBuilder: NSObject {
     // MARK: - Public Methods
 
     public func showBulletin(above viewController: UIViewController) {
+        guard !bulletinManager.isShowingBulletin else {
+            return
+        }
+
         bulletinManager.showBulletin(above: viewController)
     }
 

diff --git a/OBAKit/Reachability/Reachability.swift b/OBAKit/Reachability/Reachability.swift
@@ -36,7 +36,10 @@ class ReachabilityBulletin: NSObject {
     }
 
     func showStatus(_ status: ConnectivityResult, in application: UIApplication) {
-        guard !status.isConnected else {
+        guard
+            !status.isConnected,
+            !bulletinManager.isShowingBulletin
+        else {
             return
         }
 
@@ -50,6 +53,7 @@ class ReachabilityBulletin: NSObject {
         }
 
         dismiss()
+
         bulletinManager.showBulletin(in: application)
     }
 

diff --git a/OBAKit/Regions/RegionMismatchBulletin.swift b/OBAKit/Regions/RegionMismatchBulletin.swift
@@ -56,6 +56,9 @@ class RegionMismatchBulletin: NSObject {
     }
 
     func show(in app: UIApplication) {
+        guard !bulletinManager.isShowingBulletin else {
+            return
+        }
         bulletinManager.showBulletin(in: app)
     }
 }