From 5a4dec3dc5f8d2443c5670bf85fbd5e61d102cfd Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Wed, 23 Aug 2023 17:16:40 -0400
Subject: [PATCH 1/3] Fix stop button for Android

---
 client/vpnconnection.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
index 96c7b6fb7..9f56ad97f 100644
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@@ -411,11 +411,12 @@ void VpnConnection::disconnectFromVpn()
     }
 #endif
 
-    if (!m_vpnProtocol.data()) {
-        emit connectionStateChanged(VpnProtocol::Disconnected);
 #ifdef Q_OS_ANDROID
-        AndroidController::instance()->stop();
+    AndroidController::instance()->stop();
 #endif
+
+    if (!m_vpnProtocol.data()) {
+        emit connectionStateChanged(VpnProtocol::Disconnected);
         return;
     }
 

From b6d020e20201de3381d13364e016904bd88f5fd3 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Wed, 23 Aug 2023 21:14:36 -0400
Subject: [PATCH 2/3] Update prebuilt (fix freezed connection after vpn over
 cloak android)

---
 client/3rd-prebuilt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index 9a3cf57a1..75ab7e241 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit 9a3cf57a1166c634d43e75f00ff6072938aea5cb
+Subproject commit 75ab7e2418b83af7f8ed0a448ec5081b37b54442

From abefb011a59d6c08fbbd105f737f0923d786f7f5 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Thu, 24 Aug 2023 09:12:06 -0400
Subject: [PATCH 3/3] Fix MacOS artifact from GH actions

---
 deploy/build_macos.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
index e820ef5f9..54b6dbe3c 100755
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -68,6 +68,8 @@ echo "____________________________________"
 # Package
 echo "Packaging ..."
 
+
+cp -Rv $PREBUILT_DEPLOY_DATA_DIR/* $BUNDLE_DIR/Contents/macOS
 $QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite -qmldir=$PROJECT_DIR
 cp -av $BUILD_DIR/service/server/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
 cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS
@@ -113,7 +115,6 @@ fi
 echo "Packaging installer..."
 mkdir -p $INSTALLER_DATA_DIR
 cp -av $PROJECT_DIR/deploy/installer $BUILD_DIR
-cp -r $PREBUILT_DEPLOY_DATA_DIR/* $DEPLOY_DATA_DIR
 cp -av $DEPLOY_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_install.sh
 cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh
 cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME