summaryrefslogtreecommitdiff
path: root/app/src/insecure
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2017-05-17 11:05:41 +0200
committerkwadronaut <kwadronaut@leap.se>2017-05-17 11:05:41 +0200
commitac4047ce11c91a752c910f4afcd24f69a1621ef3 (patch)
tree044b866f2bd9a83246a6128c0e6f8afc4ce5a9d0 /app/src/insecure
parent66c79953db6876ec17a7ebf50dc4fd07d24fae37 (diff)
parent59985587c758f93844df7600f18c0837c672f259 (diff)
Merge branch 'develop' move to 'master-'based development
Diffstat (limited to 'app/src/insecure')
-rw-r--r--app/src/insecure/java/se/leap/bitmaskclient/ProviderAPI.java8
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();