Fixed #74 and #64

Ombi-app · Mar 22, 2016 · da8b634 · da8b634
1 parent 206fd74
commit da8b634
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs
@@ -62,12 +62,9 @@ public static void Publish(string title, string requester)
 
         public static void Subscribe(INotification notification)
         {
-            Log.Trace("Subscribing Observer {0}", notification.NotificationName);
             INotification notificationValue;
             if (Observers.TryGetValue(notification.NotificationName, out notificationValue))
             {
-                Log.Trace("Observer {0} already exists", notification.NotificationName);
-                // Observer already exists
                 return;
             }
 

diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
@@ -356,8 +356,15 @@ private Response SaveEmailNotifications()
             Log.Trace(settings.DumpJson());
 
             var result = EmailService.SaveSettings(settings);
-
-            NotificationService.Subscribe(new EmailMessageNotification(EmailService));
+
+            if (settings.Enabled)
+            {
+                NotificationService.Subscribe(new EmailMessageNotification(EmailService));
+            }
+            else
+            {
+                NotificationService.UnSubscribe(new EmailMessageNotification(EmailService));
+            }
 
             Log.Info("Saved email settings, result: {0}", result);
             return Response.AsJson(result
@@ -389,8 +396,14 @@ private Response SavePushbulletNotifications()
             Log.Trace(settings.DumpJson());
 
             var result = PushbulletService.SaveSettings(settings);
-
-            NotificationService.Subscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+            if (settings.Enabled)
+            {
+                NotificationService.Subscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+            }
+            else
+            {
+                NotificationService.UnSubscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+            }
 
             Log.Info("Saved email settings, result: {0}", result);
             return Response.AsJson(result