Throwing malformed URL fixes android-async-http#115, Throwing Interrupted exception fixes android-async-http#323

Author: smarek

library/src/com/loopj/android/http/AsyncHttpRequest.java

@@ -28,6 +28,7 @@
 
 import java.io.IOException;
 import java.net.ConnectException;
+import java.net.MalformedURLException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
@@ -74,16 +75,19 @@ public void run() {
         }
     }
 
-    private void makeRequest() throws IOException {
+    private void makeRequest() throws IOException, InterruptedException {
         if (!Thread.currentThread().isInterrupted()) {
             try {
+                // Fixes #115
+                if (request.getURI().getScheme() == null)
+                    throw new MalformedURLException("No valid URI scheme was provided");
                 HttpResponse response = client.execute(request, context);
                 if (!Thread.currentThread().isInterrupted()) {
                     if (responseHandler != null) {
                         responseHandler.sendResponseMessage(response);
                     }
                 } else {
-                    //TODO: should raise InterruptedException? this block is reached whenever the request is cancelled before its response is received
+                    throw new InterruptedException("makeRequest was interrupted");
                 }
             } catch (IOException e) {
                 if (!Thread.currentThread().isInterrupted()) {
@@ -104,7 +108,7 @@ private void makeRequestWithRetries() throws ConnectException {
                 makeRequest();
                 return;
             } catch (ClientProtocolException e) {
-                if(responseHandler != null) {
+                if (responseHandler != null) {
                     responseHandler.sendFailureMessage(e, "cannot repeat the request");
                 }
                 return;
@@ -137,6 +141,9 @@ private void makeRequestWithRetries() throws ConnectException {
                 // http://code.google.com/p/android/issues/detail?id=5255
                 cause = new IOException("NPE in HttpClient" + e.getMessage());
                 retry = retryHandler.retryRequest(cause, ++executionCount, context);
+            } catch (InterruptedException e) {
+                cause = new IOException("Request was interrupted while executing");
+                retry = retryHandler.retryRequest(cause, ++executionCount, context);
             }
         }