diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-10 19:45:06 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-10 19:45:06 +0200 |
| commit | 569defe3213fc4f9d6a61a98e35c794b2fe0d311 (patch) | |
| tree | 1e9b01cbd5878bc5d3a905f6239916dc0185ccb9 /app/src/main | |
| parent | 0e8fccf9ba9e509f1aaa65e58bc2cfd4754f90f4 (diff) | |
| parent | 46638f7101e752be76bcafe061f4b5e68ee88088 (diff) | |
Merge branch 'develop' into release-0.9.4
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 26 |
1 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(); + } } } |