summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2020-07-31 13:05:44 +0200
committerArne Schwabe <arne@rfc2549.org>2020-07-31 13:05:44 +0200
commit81f9dffbb8bdfd6238e1ac9d7de4ab6be2ed65c7 (patch)
treeedaf8cd41f1ccde57a2208f7ab1ab90f91dff78d
parentb55f0075b698d316d63bfd91401df85f4443f260 (diff)
Small fixes
-rw-r--r--build.gradle.kts2
-rw-r--r--main/build.gradle.kts8
-rw-r--r--main/src/main/cpp/CMakeLists.txt2
-rw-r--r--main/src/test/java/de/blinkt/openvpn/core/TestConfigGenerator.java5
-rw-r--r--main/src/test/java/de/blinkt/openvpn/core/TestIpParser.java3
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt2
6 files changed, 9 insertions, 13 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 7346790b..7a722243 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath("com.android.tools.build:gradle:4.0.0")
+ classpath("com.android.tools.build:gradle:4.0.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index e88aec35..f1e2a79f 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -13,11 +13,11 @@ plugins {
}
android {
- compileSdkVersion(29)
+ compileSdkVersion(30)
defaultConfig {
minSdkVersion(14)
- targetSdkVersion(29) //'Q'.toInt()
+ targetSdkVersion(30) //'Q'.toInt()
versionCode = 169
versionName = "0.7.16"
@@ -150,7 +150,7 @@ android.applicationVariants.all(object : Action<ApplicationVariant> {
override fun execute(variant: ApplicationVariant) {
val sourceDir = registerGenTask(variant.name, variant.baseName.replace("-", "/"))
val task = tasks.named("generateOpenVPN3Swig${variant.name}").get()
-
+
variant.registerJavaGeneratingTask(task, sourceDir)
}
})
@@ -170,7 +170,7 @@ dependencies {
// Is there a nicer way to do this?
dependencies.add("uiImplementation", "androidx.constraintlayout:constraintlayout:1.1.3")
- dependencies.add("uiImplementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70")
+ dependencies.add("uiImplementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72")
dependencies.add("uiImplementation", "androidx.cardview:cardview:1.0.0")
dependencies.add("uiImplementation", "androidx.recyclerview:recyclerview:1.0.0")
dependencies.add("uiImplementation", "androidx.appcompat:appcompat:1.1.0")
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