Merge

2 files changed, 7 insertions, 37 deletions

diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs
index 55c30765d..5de175095 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -1,13 +1,12 @@
-using System;

+using MediaBrowser.Model.Configuration;

+using MediaBrowser.Model.DTO;

+using MediaBrowser.Model.Weather;

+using System;

 using System.IO;

 using System.Net;

 using System.Net.Http;

 using System.Text;

 using System.Threading.Tasks;

-using MediaBrowser.Model.Configuration;

-using MediaBrowser.Model.DTO;

-using MediaBrowser.Model.Entities;

-using MediaBrowser.Model.Weather;

 

 namespace MediaBrowser.ApiInteraction

 {

@@ -62,35 +61,6 @@ namespace MediaBrowser.ApiInteraction
             }

         }

 

-        public void GetAllUsersAsync(Action<DTOUser[]> callback)

-        {

-            string url = ApiUrl + "/users";

-

-            HttpWebRequest request = HttpWebRequest.CreateHttp(url);

-

-            request.BeginGetResponse(new AsyncCallback(result =>

-            {

-                HttpWebResponse response = (result.AsyncState as HttpWebRequest).EndGetResponse(result) as HttpWebResponse;

-

-                Stream stream = response.GetResponseStream();

-

-            }), request);

-        }

-

-        public void GetData<T>(string url, SerializationFormats serializationFormat, Action<T> callback)

-        {

-            HttpWebRequest request = HttpWebRequest.CreateHttp(url);

-            //request.AutomaticDecompression = DecompressionMethods.Deflate;

-

-            request.BeginGetResponse(new AsyncCallback(result =>

-            {

-                HttpWebResponse response = (result.AsyncState as HttpWebRequest).EndGetResponse(result) as HttpWebResponse;

-

-                Stream stream = response.GetResponseStream();

-

-            }), request);

-        }

-

         /// <summary>

         /// Gets all Genres

         /// </summary>

diff --git a/MediaBrowser.ApiInteraction/BaseApiClient.cs b/MediaBrowser.ApiInteraction/BaseApiClient.cs
index 805ba353a..c218db0ae 100644
--- a/MediaBrowser.ApiInteraction/BaseApiClient.cs
+++ b/MediaBrowser.ApiInteraction/BaseApiClient.cs
@@ -1,7 +1,7 @@
-using System;

-using System.IO;

-using MediaBrowser.Model.DTO;

+using MediaBrowser.Model.DTO;

 using MediaBrowser.Model.Entities;

+using System;

+using System.IO;

 

 namespace MediaBrowser.ApiInteraction

 {