From 59dc591f66c20b6417aa2baa9503a154585386f9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 2 Jul 2014 14:34:08 -0400
Subject: update to jquery mobile 1.4.3

---
 .../NotificationConfigurationFactory.cs             | 21 +++++++++++++++++++++
 .../Notifications/NotificationManager.cs            | 16 ++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs

(limited to 'MediaBrowser.Server.Implementations/Notifications')

diff --git a/MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs b/MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs
new file mode 100644
index 0000000000..a336eba0ed
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs
@@ -0,0 +1,21 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Notifications;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Server.Implementations.Notifications
+{
+    public class NotificationConfigurationFactory : IConfigurationFactory
+    {
+        public IEnumerable<ConfigurationStore> GetConfigurations()
+        {
+            return new List<ConfigurationStore>
+            {
+                new ConfigurationStore
+                {
+                    Key = "notifications",
+                    ConfigurationType = typeof (NotificationOptions)
+                }
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs b/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
index 416b29e86b..964e2cd243 100644
--- a/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -30,13 +31,18 @@ namespace MediaBrowser.Server.Implementations.Notifications
             _logger = logManager.GetLogger(GetType().Name);
         }
 
+        private NotificationOptions GetConfiguration()
+        {
+            return _config.GetConfiguration<NotificationOptions>("notifications");
+        }
+
         public Task SendNotification(NotificationRequest request, CancellationToken cancellationToken)
         {
             var notificationType = request.NotificationType;
 
             var options = string.IsNullOrWhiteSpace(notificationType) ?
                 null :
-                _config.Configuration.NotificationOptions.GetOptions(notificationType);
+                GetConfiguration().GetOptions(notificationType);
 
             var users = GetUserIds(request, options)
                 .Except(request.ExcludeUserIds)
@@ -223,7 +229,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
         private bool IsEnabled(INotificationService service, string notificationType)
         {
             return string.IsNullOrEmpty(notificationType) ||
-                _config.Configuration.NotificationOptions.IsServiceEnabled(service.Name, notificationType);
+                GetConfiguration().IsServiceEnabled(service.Name, notificationType);
         }
 
         public void AddParts(IEnumerable<INotificationService> services, IEnumerable<INotificationTypeFactory> notificationTypeFactories)
@@ -248,9 +254,11 @@ namespace MediaBrowser.Server.Implementations.Notifications
 
             }).SelectMany(i => i).ToList();
 
+            var config = GetConfiguration();
+
             foreach (var i in list)
             {
-                i.Enabled = _config.Configuration.NotificationOptions.IsEnabled(i.Type);
+                i.Enabled = config.IsEnabled(i.Type);
             }
 
             return list;
-- 
cgit v1.2.3