aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Kernel.cs9
-rw-r--r--MediaBrowser.Controller/Plugins/PluginSecurityManager.cs5
-rw-r--r--MediaBrowser.Controller/Updates/InstallationManager.cs2
3 files changed, 6 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 48dfa5c16c..6faa20012b 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -1,6 +1,7 @@
using MediaBrowser.Common.Kernel;
using MediaBrowser.Common.Plugins;
using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Common.Security;
using MediaBrowser.Common.Updates;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Entities;
@@ -92,12 +93,6 @@ namespace MediaBrowser.Controller
public UserDataManager UserDataManager { get; private set; }
/// <summary>
- /// Gets the plug-in security manager.
- /// </summary>
- /// <value>The plug-in security manager.</value>
- public PluginSecurityManager PluginSecurityManager { get; private set; }
-
- /// <summary>
/// The _users
/// </summary>
private IEnumerable<User> _users;
@@ -321,7 +316,7 @@ namespace MediaBrowser.Controller
ImageManager = (ImageManager)ApplicationHost.CreateInstance(typeof(ImageManager));
ProviderManager = (ProviderManager)ApplicationHost.CreateInstance(typeof(ProviderManager));
UserDataManager = (UserDataManager)ApplicationHost.CreateInstance(typeof(UserDataManager));
- PluginSecurityManager = (PluginSecurityManager)ApplicationHost.CreateInstance(typeof(PluginSecurityManager));
+ SecurityManager = (PluginSecurityManager)ApplicationHost.CreateInstance(typeof(PluginSecurityManager));
base.FindParts();
diff --git a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
index db3f20ee3f..3a097ba1ff 100644
--- a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
+++ b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Serialization;
+using MediaBrowser.Common.Security;
+using MediaBrowser.Model.Serialization;
using Mediabrowser.Model.Entities;
using Mediabrowser.PluginSecurity;
using MediaBrowser.Common.Kernel;
@@ -12,7 +13,7 @@ namespace MediaBrowser.Controller.Plugins
/// <summary>
/// Class PluginSecurityManager
/// </summary>
- public class PluginSecurityManager
+ public class PluginSecurityManager : ISecurityManager
{
/// <summary>
/// The _is MB supporter
diff --git a/MediaBrowser.Controller/Updates/InstallationManager.cs b/MediaBrowser.Controller/Updates/InstallationManager.cs
index 64b72ae636..633cc6bc31 100644
--- a/MediaBrowser.Controller/Updates/InstallationManager.cs
+++ b/MediaBrowser.Controller/Updates/InstallationManager.cs
@@ -183,7 +183,7 @@ namespace MediaBrowser.Controller.Updates
PackageType? packageType = null,
Version applicationVersion = null)
{
- var data = new Dictionary<string, string> { { "key", Kernel.PluginSecurityManager.SupporterKey }, { "mac", _networkManager.GetMacAddress() } };
+ var data = new Dictionary<string, string> { { "key", Kernel.SecurityManager.SupporterKey }, { "mac", _networkManager.GetMacAddress() } };
using (var json = await HttpClient.Post(Controller.Kernel.MBAdminUrl + "service/package/retrieveall", data, Kernel.ResourcePools.Mb, cancellationToken).ConfigureAwait(false))
{