summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-05-29 20:19:24 +0200
committerParménides GV <parmegv@sdf.org>2014-05-29 20:19:24 +0200
commite50339824809da28beabfaf9ecea7414c131cbfe (patch)
tree5a9ec35a0c6d9d77afcb98eb8d88d342116986e6 /app/src/main/java/de/blinkt/openvpn/VpnProfile.java
parent2ee8fb46dc2b719426e9735ba4a80729f1edc1d8 (diff)
ics-openvpn receives ifconfig from the server.
Refactored AndroidManifest to include launchvpn and openvpnservice. Imported changes from ics-openvpn-upstream
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/VpnProfile.java')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/VpnProfile.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 000fc47c..da0298f2 100644
--- a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -727,8 +727,8 @@ public class VpnProfile implements Serializable {
//! Return an error if somethign is wrong
public int checkProfile(Context context) {
if (mAuthenticationType == TYPE_KEYSTORE || mAuthenticationType == TYPE_USERPASS_KEYSTORE) {
- if (mAlias == null)
- return R.string.no_keystore_cert_selected;
+ // if (mAlias == null)
+ // return R.string.no_keystore_cert_selected;
}
if (!mUsePull || mAuthenticationType == TYPE_STATICKEYS) {