diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-04 18:46:27 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-04 18:48:40 +0100 |
| commit | a137eccdde9349dc52b29fdadcb44cf317465c5a (patch) | |
| tree | 1007656c2401d970d7e369c50272cd27ed14d203 /app | |
| parent | e54f0cf39cce1c27b7baca77d777c7c271e4d108 (diff) | |
Gradle 2.1 and retry connection on auth-failure
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EIP.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index 9207ff84..9c1d5b4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'android' -import org.ajoberstar.grgit.* +//import org.ajoberstar.grgit.* android { compileSdkVersion 19 @@ -58,7 +58,7 @@ def processFileInplace(file, Closure processText) { task checkoutStrippedIcsOpenVPN ( type: Copy ) { //FIXME Checkout ics-openvpn-stripped from branch "ics-openvpn-upstream" - grgit = Grgit.open(project.file('../')) + //grgit = Grgit.open(project.file('../')) from '../../bitmask_android_tmp/ics-openvpn-stripped' into '../ics-openvpn-stripped' diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java index a2a06fbd..cf02f32f 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java @@ -484,6 +484,7 @@ public final class EIP extends IntentService { cp.parseConfig(new StringReader(certSecretFromSharedPreferences())); cp.parseConfig(new StringReader("remote-cert-tls server")); cp.parseConfig(new StringReader("persist-tun")); + cp.parseConfig(new StringReader("auth-retry nointeract")); VpnProfile vp = cp.convertProfile(); //vp.mAuthenticationType=VpnProfile.TYPE_STATICKEYS; mVpnProfile = vp; |