diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2020-07-31 13:05:44 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2020-07-31 13:05:44 +0200 |
| commit | 81f9dffbb8bdfd6238e1ac9d7de4ab6be2ed65c7 (patch) | |
| tree | edaf8cd41f1ccde57a2208f7ab1ab90f91dff78d /main/src | |
| parent | b55f0075b698d316d63bfd91401df85f4443f260 (diff) | |
Small fixes
Diffstat (limited to 'main/src')
4 files changed, 4 insertions, 8 deletions
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt index bfd06fba..93539483 100644 --- a/main/src/main/cpp/CMakeLists.txt +++ b/main/src/main/cpp/CMakeLists.txt @@ -207,7 +207,7 @@ set(openvpn_srcs PREPEND(openvpn_srcs_with_path "openvpn" ${openvpn_srcs}) -add_library(openvpn SHARED ${openvpn_srcs_with_path}) +add_library(openvpn STATIC ${openvpn_srcs_with_path}) target_include_directories(openvpn PRIVATE openvpn-config diff --git a/main/src/test/java/de/blinkt/openvpn/core/TestConfigGenerator.java b/main/src/test/java/de/blinkt/openvpn/core/TestConfigGenerator.java index 91e90f86..378bc630 100644 --- a/main/src/test/java/de/blinkt/openvpn/core/TestConfigGenerator.java +++ b/main/src/test/java/de/blinkt/openvpn/core/TestConfigGenerator.java @@ -48,11 +48,6 @@ public class TestConfigGenerator { VpnProfile vp = new VpnProfile ("test") { @Override - public String getVersionEnvString(Context c) { - return "no ver"; - } - - @Override public String getPlatformVersionEnvString() { return "test"; } diff --git a/main/src/test/java/de/blinkt/openvpn/core/TestIpParser.java b/main/src/test/java/de/blinkt/openvpn/core/TestIpParser.java index 6b330b63..b57749e3 100644 --- a/main/src/test/java/de/blinkt/openvpn/core/TestIpParser.java +++ b/main/src/test/java/de/blinkt/openvpn/core/TestIpParser.java @@ -5,8 +5,7 @@ package de.blinkt.openvpn.core; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import java.net.Inet6Address; diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt b/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt index 2bad9e81..1a16829e 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt +++ b/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt @@ -40,6 +40,8 @@ class InternalWebView : AppCompatActivity() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) attachMessageHandler() + val startData = "Trying to open page at ${intent.data.toString()}" + webView.loadData(startData,"text/plain","UTF-8"); webView.loadUrl(intent.data.toString()) webView.settings.javaScriptEnabled = true |