Merge pull request #1016 from MediaBrowser/dev

3.0.5518.5

2 files changed, 37 insertions, 0 deletions

diff --git a/MediaBrowser.Model/ApiClient/IConnectionManager.cs b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
index 658c71ac5..341df2728 100644
--- a/MediaBrowser.Model/ApiClient/IConnectionManager.cs
+++ b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
@@ -55,6 +55,13 @@ namespace MediaBrowser.Model.ApiClient
         IApiClient GetApiClient(IHasServerId item);
 
         /// <summary>
+        /// Gets the API client.
+        /// </summary>
+        /// <param name="serverId">The server identifier.</param>
+        /// <returns>IApiClient.</returns>
+        IApiClient GetApiClient(string serverId);
+        
+        /// <summary>
         /// Connects the specified cancellation token.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
diff --git a/MediaBrowser.Model/ApiClient/NetworkStatus.cs b/MediaBrowser.Model/ApiClient/NetworkStatus.cs
new file mode 100644
index 000000000..715087607
--- /dev/null
+++ b/MediaBrowser.Model/ApiClient/NetworkStatus.cs
@@ -0,0 +1,30 @@
+
+namespace MediaBrowser.Model.ApiClient
+{
+    public class NetworkStatus
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is network available.
+        /// </summary>
+        /// <value><c>true</c> if this instance is network available; otherwise, <c>false</c>.</value>
+        public bool IsNetworkAvailable { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is local network available.
+        /// </summary>
+        /// <value><c>null</c> if [is local network available] contains no value, <c>true</c> if [is local network available]; otherwise, <c>false</c>.</value>
+        public bool? IsLocalNetworkAvailable { get; set; }
+        /// <summary>
+        /// Gets the is any local network available.
+        /// </summary>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
+        public bool GetIsAnyLocalNetworkAvailable()
+        {
+            if (!IsLocalNetworkAvailable.HasValue)
+            {
+                return IsNetworkAvailable;
+            }
+
+            return IsLocalNetworkAvailable.Value;
+        }
+    }
+}