Merge main into feature/ideNotifs

aws · Nov 30, 2024 · 920d068 · 920d068
2 parents 2e9c4f6 + 46c4a3c
commit 920d068
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...munity/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt b/...munity/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt
@@ -59,12 +59,10 @@ object NotificationManager {
         add(
             NotificationActionList(AwsCoreBundle.message("general.more_dialog")) {
                 if (url == null) {
-                    Messages.showYesNoDialog(
+                    Messages.showMessageDialog(
                         project,
                         message,
                         title,
-                        AwsCoreBundle.message("general.acknowledge"),
-                        AwsCoreBundle.message("general.cancel"),
                         AllIcons.General.Error
                     )
                 } else {

diff --git a/.../src/software/aws/toolkits/jetbrains/core/notifications/NotificationServiceInitializer.kt b/.../src/software/aws/toolkits/jetbrains/core/notifications/NotificationServiceInitializer.kt
@@ -13,6 +13,7 @@ internal class NotificationServiceInitializer : ProjectActivity {
     private val initialized = AtomicBoolean(false)
 
     override suspend fun execute(project: Project) {
+        ProcessNotificationsBase.getInstance(project)
         if (ApplicationManager.getApplication().isUnitTestMode) return
         if (initialized.compareAndSet(false, true)) {
             val service = NotificationPollingService.getInstance()

diff --git a/...munity/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt b/...munity/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt
@@ -31,6 +31,7 @@ class ProcessNotificationsBase(
 ) {
     private val notifListener = mutableListOf<NotifListener>()
     init {
+        LOG.info { "Initializing ProcessNotificationsBase" }
         NotificationPollingService.getInstance().addObserver {
             retrieveStartupAndEmergencyNotifications()
         }