diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-18 17:40:03 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-18 17:40:03 +0200 |
| commit | ba091f74b6fe9b621569df3778174ada495cae92 (patch) | |
| tree | 8b34a89ebc0417380eb7ae8116187de41fe28fd2 /app/src/main/java/se/leap/bitmaskclient/EIP.java | |
| parent | 83382477dfd3a483c42e479ee5f2dabd8c670d89 (diff) | |
| parent | d335503ffa00602aaccd1abf0549de50f788cc2d (diff) | |
Merge branch 'develop' into release-0.6.0
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/EIP.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EIP.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java index 40fe7fe1..41299318 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java @@ -90,6 +90,7 @@ public final class EIP extends IntentService { public final static String STATUS = "eip status"; public final static String DATE_FROM_CERTIFICATE = "date from certificate"; public final static String ALLOWED_ANON = "allow_anonymous"; + public final static String ALLOWED_REGISTERED = "allow_registration"; public final static String CERTIFICATE = "cert"; public final static String PRIVATE_KEY = "private_key"; public final static String KEY = "eip"; @@ -461,6 +462,7 @@ public final class EIP extends IntentService { cp.parseConfig(new StringReader(keySecretFromSharedPreferences())); cp.parseConfig(new StringReader(certSecretFromSharedPreferences())); cp.parseConfig(new StringReader("remote-cert-tls server")); + cp.parseConfig(new StringReader("persist-tun")); VpnProfile vp = cp.convertProfile(); //vp.mAuthenticationType=VpnProfile.TYPE_STATICKEYS; mVpnProfile = vp; |