diff options
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java | 7 | ||||
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java index e694499f..5dc96bbc 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java +++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java @@ -604,10 +604,9 @@ public class ConfigParser { np.mAuthenticationType=VpnProfile.TYPE_USERPASS_KEYSTORE; } if(authuser.size()>1) { - // Set option value to password get to get cance to embed later. + // Set option value to password get to embed later. np.mUsername=null; - np.mPassword=authuser.get(1); - useEmbbedUserAuth(np,authuser.get(1)); + useEmbbedUserAuth(np, authuser.get(1)); } } @@ -776,7 +775,7 @@ public class ConfigParser { return isudp; } - static public void useEmbbedUserAuth(VpnProfile np,String inlinedata) + static public void useEmbbedUserAuth(VpnProfile np, String inlinedata) { String data = VpnProfile.getEmbeddedContent(inlinedata); String[] parts = data.split("\n"); diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index ec668e4d..f12d24a5 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -628,10 +628,8 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac { ConnectivityManager cm = (ConnectivityManager) getBaseContext().getSystemService(CONNECTIVITY_SERVICE); NetworkRequest.Builder nrb = new NetworkRequest.Builder(); - nrb.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN); mLollipopDeviceStateListener = new LollipopDeviceStateListener(); - cm.requestNetwork(nrb.build(), mLollipopDeviceStateListener); cm.registerNetworkCallback(nrb.build(), mLollipopDeviceStateListener); } |