From 0d1948b50c4c82c3edaf2e008fc546942d36565a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 12 Jan 2018 16:47:45 +0100
Subject: set version name to 0.9.8RC1

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0e2d90c..f177f2c7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,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-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-- 
cgit v1.2.3


From d84eb0a1b223a5e80ddf69ba8c4ed1ccc4caeaaa Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 13 Jan 2018 00:24:17 +0100
Subject: #8773 fix failing login

---
 app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
index 9f5fdc2d..464898a5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
@@ -507,7 +507,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) {
-- 
cgit v1.2.3


From 3596d43ee4a499b3cc64be8077f7fcf57128422c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 13 Jan 2018 17:06:50 +0100
Subject: #8796 fixes that two dialogs appear on cancel vpn

---
 app/src/main/java/se/leap/bitmaskclient/VpnFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
index f1a15efd..0dfccc68 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
@@ -206,7 +206,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(dashboard.getString(android.R.string.no), new DialogInterface.OnClickListener() {
-- 
cgit v1.2.3