From 0b8f3c9d9dc714e99102e6f4c3d5e5245cd39fd3 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Mon, 12 Feb 2024 21:01:44 +0200
Subject: [PATCH 1/2] Update Cloak binary to v2.8.0

---
 client/3rd-prebuilt       | 2 +-
 client/3rd/OpenVPNAdapter | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index e568e7d0..f285f0a7 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit e568e7d0e8defe8fe009c0127323f2c55fd9be76
+Subproject commit f285f0a7340179f4fb07b58091330de95ba9f96e
diff --git a/client/3rd/OpenVPNAdapter b/client/3rd/OpenVPNAdapter
index f95f0b2b..6f71d074 160000
--- a/client/3rd/OpenVPNAdapter
+++ b/client/3rd/OpenVPNAdapter
@@ -1 +1 @@
-Subproject commit f95f0b2b569be3954b93a6a9c649208cda40b879
+Subproject commit 6f71d0743d96b022863e2e4d6ebf7984842669ee

From 2b413736a475d3cf9e97e6406a7eaed7bafa620d Mon Sep 17 00:00:00 2001
From: albexk <albexk@proton.me>
Date: Mon, 12 Feb 2024 14:43:13 +0300
Subject: [PATCH 2/2] Build with new version of awg lib. Move GoBackend to
 org.amnezia.vpn.protocol.wireguard package.

---
 client/3rd-prebuilt                                         | 2 +-
 .../kotlin/{com/wireguard/android/backend => }/GoBackend.kt | 4 +---
 .../{org/amnezia/vpn/protocol/wireguard => }/Wireguard.kt   | 1 -
 .../amnezia/vpn/protocol/wireguard => }/WireguardConfig.kt  | 0
 client/cmake/android.cmake                                  | 6 +++---
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename client/android/wireguard/src/main/kotlin/{com/wireguard/android/backend => }/GoBackend.kt (62%)
 rename client/android/wireguard/src/main/kotlin/{org/amnezia/vpn/protocol/wireguard => }/Wireguard.kt (99%)
 rename client/android/wireguard/src/main/kotlin/{org/amnezia/vpn/protocol/wireguard => }/WireguardConfig.kt (100%)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index e568e7d0..2fa21880 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit e568e7d0e8defe8fe009c0127323f2c55fd9be76
+Subproject commit 2fa21880b9e5059cf9e8856c778bad97dcad3c91
diff --git a/client/android/wireguard/src/main/kotlin/com/wireguard/android/backend/GoBackend.kt b/client/android/wireguard/src/main/kotlin/GoBackend.kt
similarity index 62%
rename from client/android/wireguard/src/main/kotlin/com/wireguard/android/backend/GoBackend.kt
rename to client/android/wireguard/src/main/kotlin/GoBackend.kt
index 485df5a0..28e48a75 100644
--- a/client/android/wireguard/src/main/kotlin/com/wireguard/android/backend/GoBackend.kt
+++ b/client/android/wireguard/src/main/kotlin/GoBackend.kt
@@ -1,7 +1,5 @@
-package com.wireguard.android.backend
+package org.amnezia.vpn.protocol.wireguard
 
-// TODO: Refactor Amnezia wireguard project by changing the JNI method names
-//  to move this object to 'org.amnezia.vpn.protocol.wireguard.backend' package
 object GoBackend {
     external fun wgGetConfig(handle: Int): String?
     external fun wgGetSocketV4(handle: Int): Int
diff --git a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt b/client/android/wireguard/src/main/kotlin/Wireguard.kt
similarity index 99%
rename from client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
rename to client/android/wireguard/src/main/kotlin/Wireguard.kt
index 87d5e249..40fa4ec6 100644
--- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
+++ b/client/android/wireguard/src/main/kotlin/Wireguard.kt
@@ -3,7 +3,6 @@ package org.amnezia.vpn.protocol.wireguard
 import android.content.Context
 import android.net.VpnService.Builder
 import java.util.TreeMap
-import com.wireguard.android.backend.GoBackend
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState
diff --git a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/WireguardConfig.kt b/client/android/wireguard/src/main/kotlin/WireguardConfig.kt
similarity index 100%
rename from client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/WireguardConfig.kt
rename to client/android/wireguard/src/main/kotlin/WireguardConfig.kt
diff --git a/client/cmake/android.cmake b/client/cmake/android.cmake
index 7ffa680e..9458bd08 100644
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@@ -42,9 +42,9 @@ set(SOURCES ${SOURCES}
 
 foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
     set_property(TARGET ${PROJECT} PROPERTY QT_ANDROID_EXTRA_LIBS
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/android/${abi}/libwg.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/android/${abi}/libwg-go.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/android/${abi}/libwg-quick.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg-go.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg-quick.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libredsocks.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libsslocal.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libtun2socks.so