connect updates

5 files changed, 42 insertions, 8 deletions

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 8a777d3a2..bc909284b 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -718,7 +718,8 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="password">The password.</param>
         /// <returns>Task.</returns>
         /// <exception cref="ArgumentNullException">userId</exception>
-        Task<AuthenticationResult> AuthenticateUserAsync(string username, string password);
+        Task<AuthenticationResult> AuthenticateUserAsync(string username, 
+            string password);
 
         /// <summary>
         /// Updates the server configuration async.
diff --git a/MediaBrowser.Model/ApiClient/IConnectionManager.cs b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
index 339522b01..e4c67f3e3 100644
--- a/MediaBrowser.Model/ApiClient/IConnectionManager.cs
+++ b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
@@ -40,6 +40,12 @@ namespace MediaBrowser.Model.ApiClient
         ConnectUser ConnectUser { get; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether [save local credentials].
+        /// </summary>
+        /// <value><c>true</c> if [save local credentials]; otherwise, <c>false</c>.</value>
+        bool SaveLocalCredentials { get; set; }
+
+        /// <summary>
         /// Gets the API client.
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs
index cb1c1e094..299e3015c 100644
--- a/MediaBrowser.Model/ApiClient/ServerInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Model.System;
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.ApiClient
@@ -19,5 +20,36 @@ namespace MediaBrowser.Model.ApiClient
         {
             WakeOnLanInfos = new List<WakeOnLanInfo>();
         }
+
+        public void ImportInfo(PublicSystemInfo systemInfo)
+        {
+            Name = systemInfo.ServerName;
+            Id = systemInfo.Id;
+
+            if (!string.IsNullOrEmpty(systemInfo.LocalAddress))
+            {
+                LocalAddress = systemInfo.LocalAddress;
+            }
+            if (!string.IsNullOrEmpty(systemInfo.WanAddress))
+            {
+                RemoteAddress = systemInfo.WanAddress;
+            }
+
+            var fullSystemInfo = systemInfo as SystemInfo;
+
+            if (fullSystemInfo != null)
+            {
+                WakeOnLanInfos = new List<WakeOnLanInfo>();
+
+                if (!string.IsNullOrEmpty(fullSystemInfo.MacAddress))
+                {
+                    WakeOnLanInfos.Add(new WakeOnLanInfo
+                    {
+                        MacAddress = fullSystemInfo.MacAddress
+                    });
+                }
+            }
+        }
+
     }
 }
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index ab0cb83c8..7f46c30f0 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -37,12 +37,6 @@ namespace MediaBrowser.Model.Configuration
         public string SubtitleLanguagePreference { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether [use forced subtitles only].
-        /// </summary>
-        /// <value><c>true</c> if [use forced subtitles only]; otherwise, <c>false</c>.</value>
-        public bool UseForcedSubtitlesOnly { get; set; }
-
-        /// <summary>
         /// Gets or sets a value indicating whether this instance is hidden.
         /// </summary>
         /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/Connect/ConnectUserServer.cs b/MediaBrowser.Model/Connect/ConnectUserServer.cs
index 6214633d8..b48a13263 100644
--- a/MediaBrowser.Model/Connect/ConnectUserServer.cs
+++ b/MediaBrowser.Model/Connect/ConnectUserServer.cs
@@ -8,5 +8,6 @@ namespace MediaBrowser.Model.Connect
         public string Name { get; set; }
         public string AccessKey { get; set; }
         public string SystemId { get; set; }
+        public string LocalAddress { get; set; }
     }
 }