From d661475c735b208f85b22c1e718ec0041aeb7ad2 Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Fri, 30 Jan 2026 06:51:16 +0100 Subject: [PATCH] chore: AmneziaVPN -> DefaultVPN renamed (#34) --- .../src/org/amnezia/vpn/AmneziaVpnService.kt | 2 +- client/cmake/macos_ne.cmake | 28 +++++------ client/macos/app/Info.plist.in | 20 ++++---- client/macos/app/app.entitlements | 2 +- client/macos/networkextension/CMakeLists.txt | 46 +++++++++---------- .../DefaultVPNNetworkExtension.entitlements | 2 +- .../ios/AmneziaSceneDelegateHooks.mm | 4 +- client/platforms/ios/Log.swift | 2 +- client/platforms/ios/NELogController.swift | 2 +- .../ios/PacketTunnelProvider+Xray.swift | 2 +- .../platforms/macos/daemon/macosfirewall.cpp | 2 +- client/ui/qml/Pages2/PageShareConnection.qml | 2 +- deploy/build_macos_ne.sh | 6 +-- deploy/data/macos/post_install.sh | 2 +- 14 files changed, 61 insertions(+), 61 deletions(-) diff --git a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt index c0197b8a..aaab7236 100644 --- a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt +++ b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt @@ -206,7 +206,7 @@ open class DefaultVpnService : VpnService() { */ override fun onCreate() { super.onCreate() - Log.d(TAG, "Create Amnezia VPN service") + Log.d(TAG, "Create Default VPN service") mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) connectionScope = CoroutineScope(SupervisorJob() + Dispatchers.IO + connectionExceptionHandler) loadServerData() diff --git a/client/cmake/macos_ne.cmake b/client/cmake/macos_ne.cmake index 90876a35..c1e174f2 100644 --- a/client/cmake/macos_ne.cmake +++ b/client/cmake/macos_ne.cmake @@ -66,8 +66,8 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Info.plist.in MACOSX_BUNDLE_ICON_FILE "AppIcon" - MACOSX_BUNDLE_INFO_STRING "AmneziaVPN" - MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPN" + MACOSX_BUNDLE_INFO_STRING "DefaultVPN" + MACOSX_BUNDLE_BUNDLE_NAME "DefaultVPN" MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}" MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLE_PROJECT_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}" MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}" @@ -75,8 +75,8 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/macos/app/app.entitlements" XCODE_ATTRIBUTE_MARKETING_VERSION "${APPLE_PROJECT_VERSION}" XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}" - XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPN" - XCODE_ATTRIBUTE_BUNDLE_INFO_STRING "AmneziaVPN" + XCODE_ATTRIBUTE_PRODUCT_NAME "DefaultVPN" + XCODE_ATTRIBUTE_BUNDLE_INFO_STRING "DefaultVPN" XCODE_GENERATE_SCHEME TRUE XCODE_ATTRIBUTE_ENABLE_BITCODE "NO" XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon" @@ -87,7 +87,7 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks" - XCODE_EMBED_APP_EXTENSIONS AmneziaVPNNetworkExtension + XCODE_EMBED_APP_EXTENSIONS DefaultVPNNetworkExtension ) if(DEPLOY) @@ -95,8 +95,8 @@ if(DEPLOY) XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "distr macos.org.amnezia.AmneziaVPN" - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "dev macos.org.amnezia.AmneziaVPN" + XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "distr macos.org.amnezia.DefaultVPN" + XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "dev macos.org.amnezia.DefaultVPN" ) else() set_target_properties(${PROJECT} PROPERTIES @@ -108,7 +108,7 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_SWIFT_VERSION "5.0" XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES" XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO" - XCODE_ATTRIBUTE_SWIFT_OBJC_INTERFACE_HEADER_NAME "AmneziaVPN-Swift.h" + XCODE_ATTRIBUTE_SWIFT_OBJC_INTERFACE_HEADER_NAME "DefaultVPN-Swift.h" XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx" ) set_target_properties(${PROJECT} PROPERTIES @@ -142,7 +142,7 @@ set_property(TARGET ${PROJECT} APPEND PROPERTY RESOURCE ) add_subdirectory(macos/networkextension) -add_dependencies(${PROJECT} AmneziaVPNNetworkExtension) +add_dependencies(${PROJECT} DefaultVPNNetworkExtension) get_target_property(QtCore_location Qt6::Core LOCATION) message("QtCore_location") @@ -155,14 +155,14 @@ set_property(TARGET ${PROJECT} PROPERTY XCODE_EMBED_FRAMEWORKS ) set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-macos) -target_link_libraries("AmneziaVPNNetworkExtension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-macos/OpenVPNAdapter.framework") +target_link_libraries("DefaultVPNNetworkExtension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-macos/OpenVPNAdapter.framework") add_custom_command(TARGET ${PROJECT} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory - $/Contents/Frameworks - COMMAND /usr/bin/find "$/Contents/Frameworks/OpenVPNAdapter.framework" -name "*.sha256" -delete + $/Contents/Frameworks + COMMAND /usr/bin/find "$/Contents/Frameworks/OpenVPNAdapter.framework" -name "*.sha256" -delete COMMAND /usr/bin/codesign --force --sign "Apple Distribution" - "$/Contents/Frameworks/OpenVPNAdapter.framework/Versions/Current/OpenVPNAdapter" - COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $ -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} + "$/Contents/Frameworks/OpenVPNAdapter.framework/Versions/Current/OpenVPNAdapter" + COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $ -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Signing OpenVPNAdapter framework" ) diff --git a/client/macos/app/Info.plist.in b/client/macos/app/Info.plist.in index 1c9ad48e..bf862773 100644 --- a/client/macos/app/Info.plist.in +++ b/client/macos/app/Info.plist.in @@ -34,7 +34,7 @@ LSSupportsOpeningDocumentsInPlace com.wireguard.ios.app_group_id - group.org.amnezia.AmneziaVPN + group.org.amnezia.DefaultVPN NSCameraUsageDescription Amnezia VPN needs access to the camera for reading QR-codes. NSAppTransportSecurity @@ -58,7 +58,7 @@ UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.amnezia-config + org.amnezia.DefaultVPN.amnezia-config UTTypeTagSpecification public.filename-extension @@ -81,7 +81,7 @@ UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.wireguard-config + org.amnezia.DefaultVPN.wireguard-config UTTypeTagSpecification public.filename-extension @@ -105,7 +105,7 @@ UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.openvpn-config + org.amnezia.DefaultVPN.openvpn-config UTTypeTagSpecification public.filename-extension @@ -124,11 +124,11 @@ public.data UTTypeDescription - AmneziaVPN backup file + DefaultVPN backup file UTTypeIconFiles UTTypeIdentifier - org.amnezia.AmneziaVPN.backup-config + org.amnezia.DefaultVPN.backup-config UTTypeTagSpecification public.filename-extension @@ -151,10 +151,10 @@ Alternate LSItemContentTypes - org.amnezia.AmneziaVPN.amnezia-config - org.amnezia.AmneziaVPN.wireguard-config - org.amnezia.AmneziaVPN.openvpn-config - org.amnezia.AmneziaVPN.backup-config + org.amnezia.DefaultVPN.amnezia-config + org.amnezia.DefaultVPN.wireguard-config + org.amnezia.DefaultVPN.openvpn-config + org.amnezia.DefaultVPN.backup-config diff --git a/client/macos/app/app.entitlements b/client/macos/app/app.entitlements index d4d7195f..44e6a904 100644 --- a/client/macos/app/app.entitlements +++ b/client/macos/app/app.entitlements @@ -23,7 +23,7 @@ com.apple.security.application-groups - group.org.amnezia.AmneziaVPN + group.org.amnezia.DefaultVPN com.apple.security.files.user-selected.read-only diff --git a/client/macos/networkextension/CMakeLists.txt b/client/macos/networkextension/CMakeLists.txt index efe1b835..9122c735 100644 --- a/client/macos/networkextension/CMakeLists.txt +++ b/client/macos/networkextension/CMakeLists.txt @@ -1,23 +1,23 @@ enable_language(Swift) -message("Client message >> macos build >> AmneziaVPNNetworkExtension") +message("Client message >> macos build >> DefaultVPNNetworkExtension") set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) -add_executable(AmneziaVPNNetworkExtension) +add_executable(DefaultVPNNetworkExtension) message("executable_path is: @executable_path/../../Frameworks") -set_target_properties(AmneziaVPNNetworkExtension PROPERTIES +set_target_properties(DefaultVPNNetworkExtension PROPERTIES XCODE_PRODUCT_TYPE com.apple.product-type.app-extension # MACOSX_BUNDLE YES BUNDLE_EXTENSION appex MACOSX_BUNDLE_SHORT_VERSION_STRING "${APPLE_PROJECT_VERSION}" - MACOSX_BUNDLE_INFO_STRING "AmneziaVPNNetworkExtension" - MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPNNetworkExtension" + MACOSX_BUNDLE_INFO_STRING "DefaultVPNNetworkExtension" + MACOSX_BUNDLE_BUNDLE_NAME "DefaultVPNNetworkExtension" XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension" XCODE_ATTRIBUTE_PRODUCT_BUNDLE_NAME "${BUILD_IOS_APP_IDENTIFIER}.network-extension" - XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/AmneziaVPNNetworkExtension.entitlements + XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/DefaultVPNNetworkExtension.entitlements XCODE_ATTRIBUTE_MARKETING_VERSION "${APP_MAJOR_VERSION}" XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${BUILD_ID}" - XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPNNetworkExtension" + XCODE_ATTRIBUTE_PRODUCT_NAME "DefaultVPNNetworkExtension" XCODE_ATTRIBUTE_APPLICATION_EXTENSION_API_ONLY "YES" XCODE_ATTRIBUTE_ENABLE_BITCODE "NO" @@ -29,7 +29,7 @@ set_target_properties(AmneziaVPNNetworkExtension PROPERTIES if(DEPLOY) message("DEPLOY is ON") - set_target_properties(AmneziaVPNNetworkExtension PROPERTIES + set_target_properties(DefaultVPNNetworkExtension PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual @@ -37,12 +37,12 @@ if(DEPLOY) XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "dev macos.org.amnezia.amneziaVPN.NE" ) else() - set_target_properties(AmneziaVPNNetworkExtension PROPERTIES + set_target_properties(DefaultVPNNetworkExtension PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic ) endif() -set_target_properties(AmneziaVPNNetworkExtension PROPERTIES +set_target_properties(DefaultVPNNetworkExtension PROPERTIES XCODE_ATTRIBUTE_SWIFT_VERSION "5.0" XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES" XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/WireGuardNetworkExtension-Bridging-Header.h" @@ -50,7 +50,7 @@ set_target_properties(AmneziaVPNNetworkExtension PROPERTIES XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO" ) -set_target_properties("AmneziaVPNNetworkExtension" PROPERTIES +set_target_properties("DefaultVPNNetworkExtension" PROPERTIES XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK" ) @@ -63,17 +63,17 @@ find_library(FW_LIBRESOLV libresolv.9.tbd) # Set the root directory set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) -target_link_libraries(AmneziaVPNNetworkExtension PRIVATE ${FW_LIBRESOLV}) +target_link_libraries(DefaultVPNNetworkExtension PRIVATE ${FW_LIBRESOLV}) -target_compile_options(AmneziaVPNNetworkExtension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\") -target_compile_options(AmneziaVPNNetworkExtension PRIVATE -DNETWORK_EXTENSION=1) +target_compile_options(DefaultVPNNetworkExtension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\") +target_compile_options(DefaultVPNNetworkExtension PRIVATE -DNETWORK_EXTENSION=1) set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/amneziawg-apple/Sources) message("WG_APPLE_SOURCE_DIR is: ${WG_APPLE_SOURCE_DIR}") message("CLIENT_ROOT_DIR is: ${CLIENT_ROOT_DIR}") -target_sources(AmneziaVPNNetworkExtension PRIVATE +target_sources(DefaultVPNNetworkExtension PRIVATE ${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift ${WG_APPLE_SOURCE_DIR}/WireGuardKit/PacketTunnelSettingsGenerator.swift ${WG_APPLE_SOURCE_DIR}/WireGuardKit/DNSResolver.swift @@ -106,11 +106,11 @@ target_sources(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/platforms/ios/XrayConfig.swift ) -target_sources(AmneziaVPNNetworkExtension PRIVATE +target_sources(DefaultVPNNetworkExtension PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/PrivacyInfo.xcprivacy ) -set_property(TARGET AmneziaVPNNetworkExtension APPEND PROPERTY RESOURCE +set_property(TARGET DefaultVPNNetworkExtension APPEND PROPERTY RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/PrivacyInfo.xcprivacy ) @@ -123,16 +123,16 @@ execute_process( string(REGEX REPLACE ".*v\([0-9.]*\).*" "\\1" WG_VERSION_STRING 1.1.1) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/wireguard-go-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-version.h) -target_sources(AmneziaVPNNetworkExtension PRIVATE +target_sources(DefaultVPNNetworkExtension PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/wireguard-go-version.h) -target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}) -target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(DefaultVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}) +target_include_directories(DefaultVPNNetworkExtension PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/macos/universal2/libwg-go.a) +target_link_libraries(DefaultVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/macos/universal2/libwg-go.a) message(${CLIENT_ROOT_DIR}) message(${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/libhev-socks5-tunnel.a) -target_link_libraries(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/libhev-socks5-tunnel.a) +target_link_libraries(DefaultVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/libhev-socks5-tunnel.a) -target_include_directories(AmneziaVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/Headers) +target_include_directories(DefaultVPNNetworkExtension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework/macos-arm64_x86_64/Headers) diff --git a/client/macos/networkextension/DefaultVPNNetworkExtension.entitlements b/client/macos/networkextension/DefaultVPNNetworkExtension.entitlements index 7e2b2072..ec41d700 100644 --- a/client/macos/networkextension/DefaultVPNNetworkExtension.entitlements +++ b/client/macos/networkextension/DefaultVPNNetworkExtension.entitlements @@ -21,7 +21,7 @@ com.apple.security.application-groups - group.org.amnezia.AmneziaVPN + group.org.amnezia.DefaultVPN com.apple.security.network.client diff --git a/client/platforms/ios/AmneziaSceneDelegateHooks.mm b/client/platforms/ios/AmneziaSceneDelegateHooks.mm index 60cbbe0f..788ed4f0 100644 --- a/client/platforms/ios/AmneziaSceneDelegateHooks.mm +++ b/client/platforms/ios/AmneziaSceneDelegateHooks.mm @@ -56,10 +56,10 @@ static void amnezia_scene_openURLContexts(id self, SEL _cmd, UIScene *scene, NSS } } -@interface AmneziaSceneDelegateHooks : NSObject +@interface DefaultSceneDelegateHooks : NSObject @end -@implementation AmneziaSceneDelegateHooks +@implementation DefaultSceneDelegateHooks + (void)load { diff --git a/client/platforms/ios/Log.swift b/client/platforms/ios/Log.swift index 1494992b..3daca993 100644 --- a/client/platforms/ios/Log.swift +++ b/client/platforms/ios/Log.swift @@ -2,7 +2,7 @@ import Foundation import os.log struct Log { - private static let subsystemIdentifier = Bundle.main.bundleIdentifier ?? "org.amnezia.AmneziaVPN" + private static let subsystemIdentifier = Bundle.main.bundleIdentifier ?? "org.amnezia.DefaultVPN" static let osLog = Logger(subsystem: subsystemIdentifier, category: "App") private static let IsLoggingEnabledKey = "IsLoggingEnabled" diff --git a/client/platforms/ios/NELogController.swift b/client/platforms/ios/NELogController.swift index 5426b865..8cbf9e4f 100644 --- a/client/platforms/ios/NELogController.swift +++ b/client/platforms/ios/NELogController.swift @@ -1,7 +1,7 @@ import Foundation import os.log -private let subsystemIdentifier = Bundle.main.bundleIdentifier ?? "org.amnezia.AmneziaVPN" +private let subsystemIdentifier = Bundle.main.bundleIdentifier ?? "org.amnezia.DefaultVPN" private let wireGuardSystemLogger = Logger(subsystem: subsystemIdentifier, category: "WireGuard") private let openVPNSystemLogger = Logger(subsystem: subsystemIdentifier, category: "OpenVPN") private let xraySystemLogger = Logger(subsystem: subsystemIdentifier, category: "Xray") diff --git a/client/platforms/ios/PacketTunnelProvider+Xray.swift b/client/platforms/ios/PacketTunnelProvider+Xray.swift index 648b3613..b2fec9d4 100644 --- a/client/platforms/ios/PacketTunnelProvider+Xray.swift +++ b/client/platforms/ios/PacketTunnelProvider+Xray.swift @@ -1,6 +1,6 @@ import Foundation import NetworkExtension -import WireGuardKitGo +// import WireGuardKitGo enum XrayErrors: Error { case noXrayConfig diff --git a/client/platforms/macos/daemon/macosfirewall.cpp b/client/platforms/macos/daemon/macosfirewall.cpp index b09799a2..4c54eac1 100644 --- a/client/platforms/macos/daemon/macosfirewall.cpp +++ b/client/platforms/macos/daemon/macosfirewall.cpp @@ -52,7 +52,7 @@ namespace { // Writable location that does NOT live inside the signed bundle. Using a // constant path under /Library/Application Support keeps the signature intact // and is accessible to the root helper. -#define DaemonDataDir QStringLiteral("/Library/Application Support/AmneziaVPN/pf") +#define DaemonDataDir QStringLiteral("/Library/Application Support/DefaultVPN/pf") #include diff --git a/client/ui/qml/Pages2/PageShareConnection.qml b/client/ui/qml/Pages2/PageShareConnection.qml index 28fdf158..54ceeaf5 100644 --- a/client/ui/qml/Pages2/PageShareConnection.qml +++ b/client/ui/qml/Pages2/PageShareConnection.qml @@ -32,7 +32,7 @@ PageType { // onVisibleChanged: { // configExtension = ".vpn" - // configCaption = qsTr("Save AmneziaVPN config") + // configCaption = qsTr("Save DefaultVPN config") // configFileName = "amnezia_config" // if (visible) { diff --git a/deploy/build_macos_ne.sh b/deploy/build_macos_ne.sh index fd3e0b74..79d7d56a 100755 --- a/deploy/build_macos_ne.sh +++ b/deploy/build_macos_ne.sh @@ -20,7 +20,7 @@ BUILD_DIR=$DEPLOY_DIR/build-macos echo "Project dir: ${PROJECT_DIR}" echo "Build dir: ${BUILD_DIR}" -APP_NAME=AmneziaVPN +APP_NAME=DefaultVPN APP_FILENAME=$APP_NAME.app APP_DOMAIN=org.amneziavpn.package PLIST_NAME=$APP_NAME.plist @@ -110,9 +110,9 @@ echo "xcode build" xcodebuild \ "OTHER_CODE_SIGN_FLAGS=--keychain '$KEYCHAIN_FILE'" \ -configuration Release \ --scheme AmneziaVPN \ +-scheme DefaultVPN \ -destination "platform=macOS" \ --project $PROJECT_DIR/build-macos/AmneziaVPN.xcodeproj +-project $PROJECT_DIR/build-macos/DefaultVPN.xcodeproj # Restore keychain to default diff --git a/deploy/data/macos/post_install.sh b/deploy/data/macos/post_install.sh index 5c71ef78..d5a71029 100755 --- a/deploy/data/macos/post_install.sh +++ b/deploy/data/macos/post_install.sh @@ -30,7 +30,7 @@ mkdir -p $LOG_FOLDER echo "`date` Script started" > $LOG_FILE echo "Requesting ${APP_NAME} to quit gracefully" >> "$LOG_FILE" -osascript -e 'tell application "AmneziaVPN" to quit' +osascript -e 'tell application "DefaultVPN" to quit' PLIST_SOURCE="$APP_PATH/Contents/Resources/$PLIST_NAME" if [ -f "$PLIST_SOURCE" ]; then