Merge pull request #1043 from MediaBrowser/dev

3.0.5557.0

1 files changed, 20 insertions, 6 deletions

diff --git a/MediaBrowser.Model/ApiClient/IConnectionManager.cs b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
index 341df2728..6ff48a044 100644
--- a/MediaBrowser.Model/ApiClient/IConnectionManager.cs
+++ b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Session;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -48,6 +49,12 @@ namespace MediaBrowser.Model.ApiClient
         bool SaveLocalCredentials { get; set; }
 
         /// <summary>
+        /// Gets the client capabilities.
+        /// </summary>
+        /// <value>The client capabilities.</value>
+        ClientCapabilities ClientCapabilities { get; }
+
+        /// <summary>
         /// Gets the API client.
         /// </summary>
         /// <param name="item">The item.</param>
@@ -66,7 +73,7 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(CancellationToken cancellationToken);
+        Task<ConnectionResult> Connect(CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Connects the specified API client.
@@ -74,7 +81,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="apiClient">The API client.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken);
+        Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken));
         
         /// <summary>
         /// Connects the specified server.
@@ -82,7 +89,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="server">The server.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken);
+        Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Connects the specified server.
@@ -91,7 +98,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="options">The options.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken);
+        Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Connects the specified server.
@@ -99,7 +106,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <param name="address">The address.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;ConnectionResult&gt;.</returns>
-        Task<ConnectionResult> Connect(string address, CancellationToken cancellationToken);
+        Task<ConnectionResult> Connect(string address, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Logouts this instance.
@@ -139,10 +146,17 @@ namespace MediaBrowser.Model.ApiClient
         Task ExchangePin(PinCreationResult pin);
 
         /// <summary>
+        /// Gets the server information.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>Task&lt;ServerInfo&gt;.</returns>
+        Task<ServerInfo> GetServerInfo(string id);
+
+        /// <summary>
         /// Gets the available servers.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken);
+        Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Authenticates an offline user with their password