From 3abeb389bf62bcbedd668e3ee661249c7748cc16 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 11 Sep 2020 11:26:06 +0200
Subject: Enable V2 signing, update openvpn/oepnvpn3

---
 main/build.gradle.kts                                        | 6 ++++--
 main/src/main/cpp/openvpn                                    | 2 +-
 main/src/main/cpp/openvpn3                                   | 2 +-
 main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'main')

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 999555c3..5ff96745 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -18,8 +18,8 @@ android {
     defaultConfig {
         minSdkVersion(14)
         targetSdkVersion(30)  //'Q'.toInt()
-        versionCode = 171
-        versionName = "0.7.17a"
+        versionCode = 172
+        versionName = "0.7.18"
 
         externalNativeBuild {
             cmake {
@@ -69,6 +69,8 @@ android {
             keyPassword = keystoreAliasPassword
             val keystoreAlias: String? by project
             keyAlias = keystoreAlias
+            isV1SigningEnabled = true
+            isV2SigningEnabled = true
         }
 
     }
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
index 25004b07..e824dfb8 160000
--- a/main/src/main/cpp/openvpn
+++ b/main/src/main/cpp/openvpn
@@ -1 +1 @@
-Subproject commit 25004b074ae416b13ecba9aa895b450a3a2d59c9
+Subproject commit e824dfb872d36b5a2047d29422405be1b75fad60
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
index ab6fc3d8..9c577420 160000
--- a/main/src/main/cpp/openvpn3
+++ b/main/src/main/cpp/openvpn3
@@ -1 +1 @@
-Subproject commit ab6fc3d8de10bc4cc3803a9aea4c04447860dca4
+Subproject commit 9c577420c3dcc94c8682b70d9d1dd7795c152a27
diff --git a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
index 2ddd4ce2..c250dc5e 100644
--- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -34,7 +34,6 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
     private OpenVPNService mService;
 
     public OpenVPNThreadv3(OpenVPNService openVpnService, VpnProfile vp) {
-        init_process();
         mVp = vp;
         mService = openVpnService;
     }
-- 
cgit v1.2.3