Always cancel on the UI thread. Fixes #96

anaisbetts · Oct 16, 2014 · 7de225e · 7de225e
1 parent ffdb1c4
commit 7de225e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs b/src/ModernHttpClient/Android/OkHttpNetworkHandler.cs
@@ -11,6 +11,7 @@
 using Java.IO;
 using System.Security.Cryptography.X509Certificates;
 using System.Globalization;
+using Android.OS;
 
 namespace ModernHttpClient
 {
@@ -85,7 +86,9 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
             var rq = builder.Build();
             var call = client.NewCall(rq);
-            cancellationToken.Register(() => call.Cancel());
+
+            // NB: Even closing a socket must be done off the UI thread. Cray!
+            cancellationToken.Register(() => Task.Run(() => call.Cancel()));
 
             var resp = default(Response);
             try {