Merge remote-tracking branch '0xacab/0.9.8' into 8802_drawer

4 files changed, 18 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4976fcc9..23e22e5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,17 @@
+0.9.8 - the UI overhaul
+Bugs:
+- fixes notification channel bug on Android 8+
+- fixes Bitmask starting always on restart regardless of the last state before the phone was turned off
+
+Features:
+- support for Android's always-on vpn system setting:
+    - Bitmask starts the vpn with the last selected profile
+    - if no vpn provile is available Bitmask blocks all outgoing internet traffic until
+      the user creates a vpn profile or enables unsecured internet traffic
+      with a click on a notification
+- improved certificate pinning mechanism
+- (more to come)
+
 0.9.7 - the maintenance release
 Bugs:
 - fixes failing login on Android 7.0 and Android 7.1 (Android Nougat)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d42e922..279181cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="131"
-    android:versionName="0.9.7">
+    android:versionCode="132"
+    android:versionName="0.9.8RC1" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
index 9b288122..2542759f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
@@ -510,7 +510,7 @@ public abstract class ProviderApiManagerBase {
      * @return response from authentication server
      */
     private JSONObject sendToServer(String url, String request_method, String jsonString, OkHttpClient okHttpClient) {
-        return requestJsonFromServer(url, request_method, jsonString, null, okHttpClient);
+        return requestJsonFromServer(url, request_method, jsonString, new ArrayList<Pair<String, String>>(), okHttpClient);
     }
 
     protected String sendGetStringToServer(@NonNull String url, @NonNull List<Pair<String, String>> headerArgs, @NonNull OkHttpClient okHttpClient) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
index 6dab1b27..f1463029 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
@@ -207,7 +207,7 @@ public class VpnFragment extends Fragment implements Observer {
                 .setPositiveButton((android.R.string.yes), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        askToStopEIP();
+                        stopEipIfPossible();
                     }
                 })
                 .setNegativeButton(activity.getString(android.R.string.no), new DialogInterface.OnClickListener() {