Merge branch 'dev' into refactoring/ios

amnezia-vpn · Aug 27, 2023 · 02fedcd · 02fedcd
2 parents 5c0bd50 + 3ce1e40
commit 02fedcd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp
@@ -415,16 +415,17 @@ void VpnConnection::disconnectFromVpn()
     }
 #endif
 
+#ifdef Q_OS_ANDROID
+    AndroidController::instance()->stop();
+#endif
+
 #ifdef Q_OS_IOS
     IosController::Instance()->disconnectVpn();
     disconnect(&m_checkTimer, &QTimer::timeout, IosController::Instance(), &IosController::checkStatus);
 #endif
 
     if (!m_vpnProtocol.data()) {
         emit connectionStateChanged(VpnProtocol::Disconnected);
-#ifdef Q_OS_ANDROID
-        AndroidController::instance()->stop();
-#endif
         return;
     }
 

diff --git 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
+ −		3rd-prebuilt/openvpn/android/arm64-v8a/libck-ovpn-plugin.so
+1 −1		3rd-prebuilt/openvpn/android/arm64-v8a/libck-ovpn-plugin.so.sha256
+ −		3rd-prebuilt/openvpn/android/arm64-v8a/libovpn3.so
+1 −1		3rd-prebuilt/openvpn/android/arm64-v8a/libovpn3.so.sha256
+ −		3rd-prebuilt/openvpn/android/arm64-v8a/libovpnutil.so
+1 −1		3rd-prebuilt/openvpn/android/arm64-v8a/libovpnutil.so.sha256
+ −		3rd-prebuilt/openvpn/android/armeabi-v7a/libck-ovpn-plugin.so
+1 −1		3rd-prebuilt/openvpn/android/armeabi-v7a/libck-ovpn-plugin.so.sha256
+ −		3rd-prebuilt/openvpn/android/armeabi-v7a/libovpn3.so
+1 −1		3rd-prebuilt/openvpn/android/armeabi-v7a/libovpn3.so.sha256
+ −		3rd-prebuilt/openvpn/android/armeabi-v7a/libovpnutil.so
+1 −1		3rd-prebuilt/openvpn/android/armeabi-v7a/libovpnutil.so.sha256
+ −		3rd-prebuilt/openvpn/android/x86/libck-ovpn-plugin.so
+1 −1		3rd-prebuilt/openvpn/android/x86/libck-ovpn-plugin.so.sha256
+ −		3rd-prebuilt/openvpn/android/x86/libovpn3.so
+1 −1		3rd-prebuilt/openvpn/android/x86/libovpn3.so.sha256
+ −		3rd-prebuilt/openvpn/android/x86/libovpnutil.so
+1 −1		3rd-prebuilt/openvpn/android/x86/libovpnutil.so.sha256
+ −		3rd-prebuilt/openvpn/android/x86_64/libck-ovpn-plugin.so
+1 −1		3rd-prebuilt/openvpn/android/x86_64/libck-ovpn-plugin.so.sha256
+ −		3rd-prebuilt/openvpn/android/x86_64/libovpn3.so
+1 −1		3rd-prebuilt/openvpn/android/x86_64/libovpn3.so.sha256
+ −		3rd-prebuilt/openvpn/android/x86_64/libovpnutil.so
+1 −1		3rd-prebuilt/openvpn/android/x86_64/libovpnutil.so.sha256