summaryrefslogtreecommitdiff
path: root/app/src/production
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2016-02-07 10:43:26 +0100
committerParménides GV <parmegv@sdf.org>2016-02-07 10:43:26 +0100
commit433754368ff4d7339f09024960b5ed92d3452b7e (patch)
tree79aa4772f46785d0c1a61285777c530a46499ee4 /app/src/production
parent64e71b3972c3d633f199058a94b5a2be0c7bb14e (diff)
parent8e67e4d2167f2508d7f069af4d69f0f2931844a7 (diff)
Merge branch 'feature/update-ics-openvpn' into develop
Diffstat (limited to 'app/src/production')
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
index a3f7db6a..b9b449f0 100644
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -32,7 +32,6 @@ import java.util.*;
import javax.net.ssl.*;
-import org.apache.http.client.*;
import org.json.*;
import org.thoughtcrime.ssl.pinning.util.*;
@@ -432,9 +431,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();
@@ -890,10 +886,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();