diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/insecure/java/se/leap/bitmaskclient/ProviderAPI.java | 8 | ||||
| -rw-r--r-- | app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java | 8 |
4 files changed, 5 insertions, 18 deletions
@@ -32,6 +32,9 @@ Finally, install a java compiler. For example: sudo apt-get install default-jdk +If you are using a 64-bit machine, you will need to install some libraries too: + sudo apt-get install lib32stdc++6 lib32z1 + ## Update git submodules We build upon ics-openvpn, which meets a submodule in our project structure. diff --git a/app/build.gradle b/app/build.gradle index fbbc8eb8..c6718303 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "22.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.2" signingConfigs { release { 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(); 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(); |