diff options
author | Parménides GV <parmegv@sdf.org> | 2014-06-27 20:12:32 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-06-27 20:12:32 +0200 |
commit | 6057466bc8b4475bf4564b9143c60753c90f9aaa (patch) | |
tree | d5b00e5e24781753dda142adec337c0a3826da4e /ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java | |
parent | 482c378c2ff3a37a76ed5788cf4eaef30a63d517 (diff) | |
parent | fccf31f212eeec368b84d86cfb3775c815fdaa2b (diff) |
Merge branch 'develop'0.5.3
Diffstat (limited to 'ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java')
-rw-r--r-- | ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java index eead600c..16519418 100644 --- a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -108,28 +108,28 @@ public class LaunchVPN extends Activity { } } - + + @Override protected void onActivityResult (int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if(requestCode==START_VPN_PROFILE) { - 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(); - } + 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(); } } + void showLogWindow() { Intent startLW = new Intent(getBaseContext(),LogWindow.class); |