diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2018-01-13 14:52:41 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2018-01-13 14:52:41 +0100 |
| commit | 3ae472a22e95a605de73622b7a024ea1f1290930 (patch) | |
| tree | 965772a0ab226f812f068eff5583666ed06b6f63 | |
| parent | 822fb455994fabff53db1108f3f5ff8ee1b7de02 (diff) | |
fix filter
| -rw-r--r-- | main/build.gradle | 12 | ||||
| -rw-r--r-- | main/src/main/cpp/CMakeLists.txt | 2 | ||||
| m--------- | main/src/main/cpp/openvpn | 0 | ||||
| -rw-r--r-- | main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/main/build.gradle b/main/build.gradle index 0d23fcdc..18e5a308 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -138,12 +138,12 @@ android.applicationVariants.all { variant -> } -android.variantFilter { variant -> - def dim = variant.flavors.collectEntries { - [(it.productFlavor.dimension): it.productFlavor.name] - } +android.applicationVariants.all { variant -> + variant.productFlavors.each { + logger.warn("A warning log message. ${it.dimension}, ${it.name}") + if (it.dimension == 'implementation' && it.name == 'ovpn3') + variant.getJavaCompiler().dependsOn(generateOpenVPN3Swig) - if (dim.dimensionOne == 'implementation' && dim.dimensionSecond == 'ovpn3') { - variant.getJavaCompiler().dependsOn(generateOpenVPN3Swig) } + }
\ No newline at end of file diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt index 78cc0a39..65f10fe4 100644 --- a/main/src/main/cpp/CMakeLists.txt +++ b/main/src/main/cpp/CMakeLists.txt @@ -135,8 +135,6 @@ set(openvpn_srcs src/openvpn/comp-lz4.c src/openvpn/comp.c src/openvpn/compstub.c - src/openvpn/env_set.c - src/openvpn/run_command.c ) PREPEND(openvpn_srcs_with_path "openvpn" ${openvpn_srcs}) diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn -Subproject badf99f453270412506a1f8e6bd99c15fb58401 +Subproject 266f017c5e818c59f71d793fa70f8e3956f00dd diff --git a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java index b96b0cde..5c5e8c3b 100644 --- a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java +++ b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java @@ -65,7 +65,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable setUserPW(); VpnStatus.logInfo(copyright()); - StatusPoller statuspoller = new StatusPoller(5000); + StatusPoller statuspoller = new StatusPoller(OpenVPNManagement.mBytecountInterval*1000); new Thread(statuspoller,"Status Poller").start(); ClientAPI_Status status = connect(); @@ -179,7 +179,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable config.setContent(vpnconfig); config.setTunPersist(mVp.mPersistTun); config.setGuiVersion(mVp.getVersionEnvString(mService)); - config.setPlatformVersion(mVp.getPlatformVersionEnvString()); + //config.setPlatformVersion(mVp.getPlatformVersionEnvString()); config.setExternalPkiAlias("extpki"); ClientAPI_EvalConfig ec = eval_config(config); |