diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-10 19:35:06 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-10 19:35:06 +0200 |
| commit | 07745ed137cb8d546c1d1b1e94714518e9df7887 (patch) | |
| tree | 372e00e6111525beb143e00c05e40d3ba3b8aabc | |
| parent | 8ca866f4cd0e829f5042101add4dfd946f5bef82 (diff) | |
Handle "Cancel" button of the Android VPN permission dialog
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 26 | ||||
| m--------- | ics-openvpn | 0 |
2 files changed, 14 insertions, 12 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java index f1d769e1..90216a70 100644 --- a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -121,18 +121,20 @@ public class LaunchVPN extends Activity { super.onActivityResult(requestCode, resultCode, data); if(requestCode==START_VPN_PROFILE) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean showLogWindow = prefs.getBoolean("showlogwindow", true); - - if(!mhideLog && showLogWindow) - showLogWindow(); - new startOpenVpnThread().start(); - } else if (resultCode == Activity.RESULT_CANCELED) { - // User does not want us to start, so we just vanish - VpnStatus.updateStateString("USER_VPN_PERMISSION_CANCELLED", "", R.string.state_user_vpn_permission_cancelled, - ConnectionStatus.LEVEL_NOTCONNECTED); - - finish(); + if(resultCode == Activity.RESULT_OK) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean showLogWindow = prefs.getBoolean("showlogwindow", true); + + if(!mhideLog && showLogWindow) + showLogWindow(); + new startOpenVpnThread().start(); + } else if (resultCode == Activity.RESULT_CANCELED) { + // User does not want us to start, so we just vanish + VpnStatus.updateStateString("USER_VPN_PERMISSION_CANCELLED", "", R.string.state_user_vpn_permission_cancelled, + ConnectionStatus.LEVEL_NOTCONNECTED); + + finish(); + } } } diff --git a/ics-openvpn b/ics-openvpn -Subproject b68d72b65d0113e3ae564b82c0cbb83ce0c296d +Subproject 86209ed15cc19e6afbbfb1e5da459f4e150b5b6 |