summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md30
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java4
2 files changed, 19 insertions, 15 deletions
diff --git a/README.md b/README.md
index 20711e63..a938bd30 100644
--- a/README.md
+++ b/README.md
@@ -48,16 +48,16 @@ The Bitmask Android Client has the following system-level dependencies:
* JDK v. 1.8
* Assorted 32-bit C libraries
-* Android SDK Tools, v. 25.2.5, with these packages:
- * Platform-Tools, v. 25.0.2
- * Build-Tools, API v. 23-25
- * Platforms 23-25
+* Android SDK Tools, v. 26.0.0, with these packages:
+ * Platform-Tools, v. 26.0.0
+ * Build-Tools, API v. 23-26
+ * Platforms 23-26
* Android Support Repository
* Google Support Repository
- * NDK v. r12b (enables C code in Android)
+ * NDK v. r15c (enables C code in Android)
* For running the app in an emulator, you will also need these packages:
* Android Emulator
- * System Images for Android APIs 23-25
+ * System Images for Android APIs 23-26
* The ICS-OpenVpn submodule
You can install them as follows:
@@ -95,7 +95,7 @@ Once you've got it installed, use the `SDK Manager` tool (Android figure Icon wi
Alternatley (eg: for build machines), you may download and unzip the `android-sdk` bundle from Google as follows (assuming an install location of `/opt/android-sdk-linux`:
```
-curl -L https://dl.google.com/android/android-sdk_r25.2.5-linux.zip -o sdk-tools.zip \
+curl -L https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -o sdk-tools.zip \
&& unzip -q sdk-tools.zip -d /opt/android-sdk-linux \
&& rm -f sdk-tools.zip
```
@@ -103,8 +103,8 @@ curl -L https://dl.google.com/android/android-sdk_r25.2.5-linux.zip -o sdk-tools
To download the NDK (for cross-compiling and running the C code used in `ics-openvpn`), use:
```
-curl -L http://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip -o ndk.zip \
- && unzip ndk.zip -d /opt/android-sdk-linux/android-ndk-r12b \
+curl -L http://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip -o ndk.zip \
+ && unzip ndk.zip -d /opt/android-sdk-linux/android-ndk-r15c \
&& rm -rf ndk.zip
```
@@ -122,16 +122,18 @@ To search for available packages of a certain type (eg: `tools`), run:
sdkmanager --list | grep tools
```
-To install all of the dependencies listed above (targetting SDK versions 23 - 25), run:
+To install all of the dependencies listed above (targetting SDK versions 23 - 26), run:
```shell
sdkmanager tools
sdkmanager platform-tools
sdkmanager extras;android;m2repository
sdkmanager extras;google;m2repository
+sdkmanager build-tools;26.0.0
sdkmanager build-tools;25.0.2
sdkmanager build-tools;24.0.3
sdkmanager build-tools;23.0.3
+sdkmanager platforms;android-26
sdkmanager platforms;android-25
sdkmanager platforms;android-24
sdkmanager platforms;android-23
@@ -160,19 +162,19 @@ To keep ourselves from messing it up all the time everyone someone new joins the
Assuming you've already [installed docker](https://docs.docker.com/engine/installation/), you can pull the image with:
``` shell
-docker pull 0xacab.org:4567/aguestuser/bitmask_android:android-ndk:latest
+docker pull 0xacab.org:4567/leap/bitmask_android/android-ndk:latest
```
Run the image with:
``` shell
-docker run --rm -it 0xacab.org:4567/aguestuser/bitmask_android:android-ndk:latest
+docker run --rm -it 0xacab.org:4567/leap/bitmask_android/android-ndk:latest
```
More likely than not, you'll want to run the image with the source code mounted. You can do that with:
``` shell
cd <path/to/bitmask_android>
-docker run --rm -it -v`pwd`:/bitmask_android -t 0xacab.org:4567/aguestuser/bitmask_android:android-ndk:latest
+docker run --rm -it -v`pwd`:/bitmask_android -t 0xacab.org:4567/leap/bitmask_android/android-ndk:latest
```
@@ -239,7 +241,7 @@ If you want to make sure the environment you use to build APKs matches exactly t
``` shell
$ cd <path/to/bitmask_android>
-$ sudo docker run --rm -it -v `pwd`:/bitmask_android 0xacab.org/leap/bitmask_android/android-ndk:latest
+$ sudo docker run --rm -it -v `pwd`:/bitmask_android 0xacab.org:4567/leap/bitmask_android/android-ndk:latest
# cd /bitmask_android
# ./gradlew assembleRelease
```
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java
index f7ab4b1e..6fb7d8a9 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/ConnectionManager.java
@@ -15,7 +15,9 @@ public class ConnectionManager {
method.setAccessible(true);
try {
method.invoke(conman, enabled);
- } catch (InvocationTargetException | IllegalAccessException e) {
+ } catch (InvocationTargetException e) {
+ //e.printStackTrace();
+ } catch (IllegalAccessException e) {
//e.printStackTrace();
}
}