summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-01-13 23:45:34 +0100
committerFup Duck <fupduck@sacknagel.com>2018-01-13 23:45:34 +0100
commit7331f55bb789840fc0fc9e162a0f2d538146fd1e (patch)
tree9ebcb39a3d5d8c4f187f765d4e1a1bb1d8482068 /app/src/main
parentcbb8250b4e8464a0d66e17a5c695d0e44fc26c6c (diff)
parentfb69ccd7088287ec886471e9acfc62a03bdad708 (diff)
Merge remote-tracking branch '0xacab/0.9.8' into 8802_drawer
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/VpnFragment.java2
3 files changed, 4 insertions, 4 deletions
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() {