Merge branch 'sync-context-callbacks' of https://github.com/petejohanson/RestSharp

Conflicts:
	RestSharp/RestClient.cs

Author: ayoung

RestSharp/Http.Async.cs

@@ -317,15 +317,7 @@ private void ResponseCallback(IAsyncResult result, Action<HttpResponse> callback
 
 		private static void ExecuteCallback(HttpResponse response, Action<HttpResponse> callback)
 		{
-#if WINDOWS_PHONE
-			var dispatcher = Deployment.Current.Dispatcher;
-			dispatcher.BeginInvoke(() =>
-			{
-#endif
 			callback(response);
-#if WINDOWS_PHONE
-			});
-#endif
 		}
 
 		partial void AddAsyncHeaderActions()

RestSharp/IRestClient.cs

@@ -41,6 +41,10 @@ public interface IRestClient
 		/// <summary>
 		/// 
 		/// </summary>
+		bool UseSynchronizationContext { get; set; }
+		/// <summary>
+		/// 
+		/// </summary>
 		IAuthenticator Authenticator { get; set; }
 		/// <summary>
 		/// 

RestSharp/RestClient.Async.cs

@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Text;
 using System.Net;
 
@@ -52,26 +53,38 @@ public virtual RestRequestAsyncHandle ExecuteAsync(IRestRequest request, Action<
 			AddDefaultParameter("Accept", accepts, ParameterType.HttpHeader);
 			HttpWebRequest webRequest = null;
 			var asyncHandle = new RestRequestAsyncHandle();
+
+			Action<HttpResponse> response_cb = r => ProcessResponse(r, asyncHandle, callback);
+
+			if (UseSynchronizationContext && SynchronizationContext.Current != null) {
+				var ctx = SynchronizationContext.Current;
+				var cb = response_cb;
+
+				response_cb = resp => ctx.Post(s => cb(resp), null);
+			}
 
 			switch(request.Method)
 			{
 				case Method.GET:
-					webRequest = http.GetAsync(r => ProcessResponse(r, asyncHandle, callback));
+					webRequest = http.GetAsync(response_cb);
 					break;
 				case Method.POST:
-					webRequest = http.PostAsync(r => ProcessResponse(r, asyncHandle, callback));
+					webRequest = http.PostAsync(response_cb);
 					break;
 				case Method.PUT:
-					webRequest = http.PutAsync(r => ProcessResponse(r, asyncHandle, callback));
+					webRequest = http.PutAsync(response_cb);
 					break;
 				case Method.DELETE:
-					webRequest = http.DeleteAsync(r => ProcessResponse(r, asyncHandle, callback));
+					webRequest = http.DeleteAsync(response_cb);
 					break;
 				case Method.HEAD:
-					webRequest = http.HeadAsync(r => ProcessResponse(r, asyncHandle, callback));
+					webRequest = http.HeadAsync(response_cb);
 					break;
 				case Method.OPTIONS:
-					webRequest = http.OptionsAsync(r => ProcessResponse(r, asyncHandle, callback));
+					webRequest = http.OptionsAsync(response_cb);
+					break;
+				case Method.PATCH:
+					webRequest = http.PatchAsync(r => ProcessResponse(r, asyncHandle, callback));
 					break;
 				case Method.PATCH:
 					webRequest = http.PatchAsync(r => ProcessResponse(r, asyncHandle, callback));

RestSharp/RestClient.cs

@@ -41,7 +41,9 @@ public partial class RestClient : IRestClient
 		/// </summary>
 		public RestClient()
 		{
-			CookieContainer = new CookieContainer ();
+#if WINDOWS_PHONE
+			UseSynchronizationContext = true;
+#endif
 			ContentHandlers = new Dictionary<string, IDeserializer>();
 			AcceptTypes = new List<string>();
 			DefaultParameters = new List<Parameter>();
@@ -241,6 +243,11 @@ IDeserializer GetHandler(string contentType)
 		/// </summary>
 		public int Timeout { get; set; }
 
+		/// <summary>
+		/// Whether to invoke async callbacks using the SynchronizationContext.Current captured when invoked
+		/// </summary>
+		public bool UseSynchronizationContext { get; set; }
+
 		/// <summary>
 		/// Authenticator to use for requests made by this client instance
 		/// </summary>