summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorfupduck <fupduck@riseup.net>2018-01-13 12:59:32 -0800
committerfupduck <fupduck@riseup.net>2018-01-13 12:59:32 -0800
commitfb69ccd7088287ec886471e9acfc62a03bdad708 (patch)
treeffcb4149c29c370ebafb66b34dacb51a99d0e5ad /app/src/main
parentd84eb0a1b223a5e80ddf69ba8c4ed1ccc4caeaaa (diff)
parent3596d43ee4a499b3cc64be8077f7fcf57128422c (diff)
Merge branch '8796_two_dialogs_appear_on_cancel_vpn' into '0.9.8'
#8796 fixes that two dialogs appear on cancel vpn See merge request leap/bitmask_android!24
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/VpnFragment.java2
1 files changed, 1 insertions, 1 deletions
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() {