fix: remove notifications before showing new ones

electron · Jun 25, 2020 · d681e19 · d681e19
1 parent 4290555
commit d681e19
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/shell/browser/notifications/mac/cocoa_notification.mm b/shell/browser/notifications/mac/cocoa_notification.mm
@@ -105,15 +105,16 @@
 }
 
 void CocoaNotification::Dismiss() {
-  if (notification_)
+  if (notification_) {
     [NSUserNotificationCenter.defaultUserNotificationCenter
         removeDeliveredNotification:notification_];
 
-  NotificationDismissed();
+    NotificationDismissed();
 
-  this->LogAction("dismissed");
+    this->LogAction("dismissed");
 
-  notification_.reset(nil);
+    notification_.reset(nil);
+  }
 }
 
 void CocoaNotification::NotificationDisplayed() {
@@ -165,8 +166,10 @@
 void CocoaNotification::LogAction(const char* action) {
   if (getenv("ELECTRON_DEBUG_NOTIFICATIONS")) {
     NSString* identifier = [notification_ valueForKey:@"identifier"];
-    LOG(INFO) << "Notification " << action << " (" << [identifier UTF8String]
-              << ")";
+    if (identifier) {
+      LOG(INFO) << "Notification " << action << " (" << [identifier UTF8String]
+                << ")";
+    }
   }
 }
 

diff --git a/shell/browser/notifications/notification_presenter.cc b/shell/browser/notifications/notification_presenter.cc
@@ -23,7 +23,9 @@ base::WeakPtr<Notification> NotificationPresenter::CreateNotification(
   Notification* notification = CreateNotificationObject(delegate);
   notification->set_notification_id(notification_id);
   notifications_.insert(notification);
-  return notification->GetWeakPtr();
+
+  last_notification_ = notification->GetWeakPtr();
+  return last_notification_;
 }
 
 void NotificationPresenter::RemoveNotification(Notification* notification) {

diff --git a/shell/browser/notifications/notification_presenter.h b/shell/browser/notifications/notification_presenter.h
@@ -28,6 +28,8 @@ class NotificationPresenter {
 
   std::set<Notification*> notifications() const { return notifications_; }
 
+  base::WeakPtr<Notification> last_notification() { return last_notification_; }
+
  protected:
   NotificationPresenter();
   virtual Notification* CreateNotificationObject(
@@ -40,6 +42,8 @@ class NotificationPresenter {
 
   std::set<Notification*> notifications_;
 
+  base::WeakPtr<Notification> last_notification_;
+
   DISALLOW_COPY_AND_ASSIGN(NotificationPresenter);
 };
 

diff --git a/shell/browser/notifications/platform_notification_service.cc b/shell/browser/notifications/platform_notification_service.cc
@@ -86,6 +86,12 @@ void PlatformNotificationService::DisplayNotification(
   auto* presenter = browser_client_->GetNotificationPresenter();
   if (!presenter)
     return;
+
+  // Ensure the last notification is removed before presenting a new one.
+  auto last_notification = presenter->last_notification();
+  if (last_notification)
+    last_notification->Dismiss();
+
   NotificationDelegateImpl* delegate =
       new NotificationDelegateImpl(notification_id);
   auto notification = presenter->CreateNotification(delegate, notification_id);