Merge branch 'develop' move to 'master-'based development

1 files changed, 0 insertions, 8 deletions

diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderAPI.java
index 2d7e13fe..df827242 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -22,7 +22,6 @@ import android.content.res.*;
 import android.os.*;
 import android.util.*;
 
-import org.apache.http.client.*;
 import org.json.*;
 import org.thoughtcrime.ssl.pinning.util.*;
 
@@ -440,9 +439,6 @@ public class ProviderAPI extends IntentService {
             is = urlConnection.getInputStream();
             String plain_response = new Scanner(is).useDelimiter("\\A").next();
             json_response = new JSONObject(plain_response);
-        } catch (ClientProtocolException e) {
-            json_response = getErrorMessage(urlConnection);
-            e.printStackTrace();
         } catch (IOException e) {
             json_response = getErrorMessage(urlConnection);
             e.printStackTrace();
@@ -908,10 +904,6 @@ public class ProviderAPI extends IntentService {
             responseCode = urlConnection.getResponseCode();
             broadcastProgress(progress++);
             LeapSRPSession.setToken("");
-        } catch (ClientProtocolException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            return false;
         } catch (IndexOutOfBoundsException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();