summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md33
1 files changed, 12 insertions, 21 deletions
diff --git a/README.md b/README.md
index 0f2fc20d..6780e462 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. 26.0.0, with these packages:
- * Platform-Tools, v. 26.0.0
- * Build-Tools, API v. 23-26
- * Platforms 23-26
+* Android SDK Tools, v. 27.0.3, with these packages:
+ * Platform-Tools, v. 27.0.3
+ * Build-Tools, API v. 23-27
+ * Platforms 23-27
* Android Support Repository
* Google Support Repository
* 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-26
+ * System Images for Android APIs 23-27
* The ICS-OpenVpn submodule
You can install them as follows:
@@ -92,7 +92,7 @@ Once you've got it installed, use the `SDK Manager` tool (Android figure Icon wi
#### With Bash <a name="with-bash"></a>
-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`:
+Alternatively (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/repository/sdk-tools-linux-3859397.zip -o sdk-tools.zip \
@@ -129,13 +129,11 @@ sdkmanager tools
sdkmanager platform-tools
sdkmanager extras;android;m2repository
sdkmanager extras;google;m2repository
-sdkmanager build-tools;26.0.0
+sdkmanager build-tools;27.0.3
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-27
sdkmanager platforms;android-25
-sdkmanager platforms;android-24
sdkmanager platforms;android-23
```
@@ -250,18 +248,11 @@ $ sudo docker run --rm -it -v `pwd`:/bitmask_android 0xacab.org:4567/leap/bitmas
To run the automated tests:
- 1. Run an emulator (device doesn't necesarily has root, so testVpnCertificateValidator.testIsValid may fail).
+ 1. Run an emulator
2. Unlock Android
3. Issue the command ./gradlew connectedCheck
4. Pay attention and check the "Trust this app" checkbox, if you don't do so tests won't run.
-Due to the nature of some tests, adb will lose its connectivity and you won't receive any tests results. To look for failed tests, do the following:
-
- 1. adb kill-server
- 2. adb logcat | less
- 3. Look for: "failed: test"
-
-We'll polish this process soon, but right now that's what we're doing.
## Debugging in an Emulator <a name="debugging-in-an-emulator"></a>
@@ -285,9 +276,9 @@ To run the app:
* Ensure you have an emulator running
* Open the left-hand project pane (Meta-1 or Cmd-1, depending on your keybindings)
-* Navigate to `bitmask_android/app/src/main/java/se/leap/bitmaskclient/Dashboard`
-* Right-click over the `Dashboard` filename and click the `Run 'Dashboard'` option (or use Shift-Ctl-F10 or Shift-Ctl-R, depending on your keybindings)
-* After you have done this once, you should be able to simply select `Dashboard` from the dropdown menu next to the big green arrow in the toolbar, then click the green arrow to run the app.
+* Navigate to `bitmask_android/app/src/main/java/se/leap/bitmaskclient/StartActivity`
+* Right-click over the `StartActivity` filename and click the `Run 'StartActivity'` option (or use Shift-Ctl-F10 or Shift-Ctl-R, depending on your keybindings)
+* After you have done this once, you should be able to simply select `StartActivity` from the dropdown menu next to the big green arrow in the toolbar, then click the green arrow to run the app.
### From the Shell <a name="from-the-shell"></a>