Merge pull request #974 from MediaBrowser/dev

3.0.5490.0

3 files changed, 6 insertions, 11 deletions

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 3e25bb626..c98a6bd6c 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -472,10 +472,10 @@ namespace MediaBrowser.Common.Implementations
 			NetworkManager = CreateNetworkManager(LogManager.GetLogger("NetworkManager"));
 			RegisterSingleInstance(NetworkManager);
 
-			SecurityManager = new PluginSecurityManager(this, HttpClient, JsonSerializer, ApplicationPaths, NetworkManager, LogManager);
+			SecurityManager = new PluginSecurityManager(this, HttpClient, JsonSerializer, ApplicationPaths, LogManager);
 			RegisterSingleInstance(SecurityManager);
 
-			InstallationManager = new InstallationManager(Logger, this, ApplicationPaths, HttpClient, JsonSerializer, SecurityManager, NetworkManager, ConfigurationManager);
+			InstallationManager = new InstallationManager(Logger, this, ApplicationPaths, HttpClient, JsonSerializer, SecurityManager, ConfigurationManager);
 			RegisterSingleInstance(InstallationManager);
 
 			ZipClient = new ZipClient();
diff --git a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
index 3e81e839f..39dd41356 100644
--- a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
+++ b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs
@@ -55,7 +55,6 @@ namespace MediaBrowser.Common.Implementations.Security
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IApplicationHost _appHost;
         private readonly ILogger _logger;
-        private readonly INetworkManager _networkManager;
         private readonly IApplicationPaths _appPaths;
 
         private IEnumerable<IRequiresRegistration> _registeredEntities;
@@ -71,7 +70,7 @@ namespace MediaBrowser.Common.Implementations.Security
         /// Initializes a new instance of the <see cref="PluginSecurityManager" /> class.
         /// </summary>
         public PluginSecurityManager(IApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer,
-            IApplicationPaths appPaths, INetworkManager networkManager, ILogManager logManager)
+            IApplicationPaths appPaths, ILogManager logManager)
         {
             if (httpClient == null)
             {
@@ -81,7 +80,6 @@ namespace MediaBrowser.Common.Implementations.Security
             _appHost = appHost;
             _httpClient = httpClient;
             _jsonSerializer = jsonSerializer;
-            _networkManager = networkManager;
             _appPaths = appPaths;
             _logger = logManager.GetLogger("SecurityManager");
         }
@@ -199,12 +197,11 @@ namespace MediaBrowser.Common.Implementations.Security
 
             if (!(lastChecked > DateTime.UtcNow.AddDays(-1)))
             {
-                var mac = _networkManager.GetMacAddress();
                 var data = new Dictionary<string, string>
                 {
                     { "feature", feature }, 
                     { "key", SupporterKey }, 
-                    { "mac", mac }, 
+                    { "mac", _appHost.SystemId }, 
                     { "systemid", _appHost.SystemId }, 
                     { "mb2equiv", mb2Equivalent }, 
                     { "ver", version }, 
diff --git a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
index f3a985968..47215aacf 100644
--- a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
+++ b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
@@ -105,7 +105,6 @@ namespace MediaBrowser.Common.Implementations.Updates
         private readonly IHttpClient _httpClient;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly ISecurityManager _securityManager;
-        private readonly INetworkManager _networkManager;
         private readonly IConfigurationManager _config;
 
         /// <summary>
@@ -114,7 +113,7 @@ namespace MediaBrowser.Common.Implementations.Updates
         /// <value>The application host.</value>
         private readonly IApplicationHost _applicationHost;
 
-        public InstallationManager(ILogger logger, IApplicationHost appHost, IApplicationPaths appPaths, IHttpClient httpClient, IJsonSerializer jsonSerializer, ISecurityManager securityManager, INetworkManager networkManager, IConfigurationManager config)
+        public InstallationManager(ILogger logger, IApplicationHost appHost, IApplicationPaths appPaths, IHttpClient httpClient, IJsonSerializer jsonSerializer, ISecurityManager securityManager, IConfigurationManager config)
         {
             if (logger == null)
             {
@@ -129,7 +128,6 @@ namespace MediaBrowser.Common.Implementations.Updates
             _httpClient = httpClient;
             _jsonSerializer = jsonSerializer;
             _securityManager = securityManager;
-            _networkManager = networkManager;
             _config = config;
             _logger = logger;
         }
@@ -158,7 +156,7 @@ namespace MediaBrowser.Common.Implementations.Updates
             var data = new Dictionary<string, string>
             {
                 { "key", _securityManager.SupporterKey }, 
-                { "mac", _networkManager.GetMacAddress() }, 
+                { "mac", _applicationHost.SystemId }, 
                 { "systemid", _applicationHost.SystemId }
             };