diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b6ec7e048..267fbf411 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -53,26 +53,26 @@ jobs: bash deploy/build_linux.sh - name: 'Pack installer' - run: cd deploy && tar -cf ObscurifyVPN_Linux_Installer.tar ObscurifyVPN_Linux_Installer.bin + run: cd deploy && tar -cf DefaultVPN_Linux_Installer.tar DefaultVPN_Linux_Installer.bin - name: 'Upload installer artifact' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN_Linux_installer.tar - path: deploy/ObscurifyVPN_Linux_Installer.tar + name: DefaultVPN_Linux_installer.tar + path: deploy/DefaultVPN_Linux_Installer.tar retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN_Linux_unpacked + name: DefaultVPN_Linux_unpacked path: deploy/AppDir retention-days: 7 - name: 'Upload translations artifact' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN_translations + name: DefaultVPN_translations path: client/translations retention-days: 7 @@ -131,14 +131,14 @@ jobs: - name: 'Upload installer artifact' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN_Windows_installer - path: ObscurifyVPN_x${{ env.BUILD_ARCH }}.exe + name: DefaultVPN_Windows_installer + path: DefaultVPN_x${{ env.BUILD_ARCH }}.exe retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN_Windows_unpacked + name: DefaultVPN_Windows_unpacked path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release retention-days: 7 @@ -237,7 +237,7 @@ jobs: # with: # name: app-store ipa & dsyms # path: | -# ${{ github.workspace }}/ObscurifyVPN-iOS.ipa +# ${{ github.workspace }}/DefaultVPN-iOS.ipa # ${{ github.workspace }}/*.app.dSYM.zip # retention-days: 7 @@ -299,15 +299,15 @@ jobs: - name: 'Upload installer artifact' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN_MacOS_installer - path: ObscurifyVPN.dmg + name: DefaultVPN_MacOS_installer + path: DefaultVPN.dmg retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN_MacOS_unpacked - path: deploy/build/client/ObscurifyVPN.app + name: DefaultVPN_MacOS_unpacked + path: deploy/build/client/DefaultVPN.app retention-days: 7 # ------------------------------------------------------ @@ -427,40 +427,40 @@ jobs: - name: 'Upload x86_64 apk' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN-android-x86_64 - path: deploy/build/ObscurifyVPN-x86_64-release.apk + name: DefaultVPN-android-x86_64 + path: deploy/build/DefaultVPN-x86_64-release.apk compression-level: 0 retention-days: 7 - name: 'Upload x86 apk' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN-android-x86 - path: deploy/build/ObscurifyVPN-x86-release.apk + name: DefaultVPN-android-x86 + path: deploy/build/DefaultVPN-x86-release.apk compression-level: 0 retention-days: 7 - name: 'Upload arm64-v8a apk' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN-android-arm64-v8a - path: deploy/build/ObscurifyVPN-arm64-v8a-release.apk + name: DefaultVPN-android-arm64-v8a + path: deploy/build/DefaultVPN-arm64-v8a-release.apk compression-level: 0 retention-days: 7 - name: 'Upload armeabi-v7a apk' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN-android-armeabi-v7a - path: deploy/build/ObscurifyVPN-armeabi-v7a-release.apk + name: DefaultVPN-android-armeabi-v7a + path: deploy/build/DefaultVPN-armeabi-v7a-release.apk compression-level: 0 retention-days: 7 - name: 'Upload aab' uses: actions/upload-artifact@v4 with: - name: ObscurifyVPN-android - path: deploy/build/ObscurifyVPN-release.aab + name: DefaultVPN-android + path: deploy/build/DefaultVPN-release.aab compression-level: 0 retention-days: 7 diff --git a/.gitignore b/.gitignore index 5476e306f..03d4047fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ # User settings *.user macOSPackage/ -ObscurifyVPN.dmg -ObscurifyVPN.exe -ObscurifyVPN_*.exe +DefaultVPN.dmg +DefaultVPN.exe +DefaultVPN_*.exe deploy/build/* deploy/build_32/* deploy/build_64/* @@ -48,7 +48,7 @@ client/ui_*.cpp client/Makefile* client/fastlane/build/ client/*build-* -client/ObscurifyVPN.xcodeproj +client/DefaultVPN.xcodeproj client/Debug-iphonesimulator/ client/amneziavpn_plugin_import.cpp client/amneziavpn_qml_plugin_import.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 71c253046..337c42847 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) -set(PROJECT ObscurifyVPN) +set(PROJECT DefaultVPN) project(${PROJECT} VERSION 4.8.2.4 - DESCRIPTION "ObscurifyVPN" + DESCRIPTION "DefaultVPN" HOMEPAGE_URL "https://amnezia.org/" ) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index cd8dfb691..d3299a142 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) -set(PROJECT ObscurifyVPN) +set(PROJECT DefaultVPN) project(${PROJECT}) @@ -296,13 +296,13 @@ if(APPLE) cmake_policy(SET CMP0114 NEW) if(NOT BUILD_OSX_APP_IDENTIFIER) - set(BUILD_OSX_APP_IDENTIFIER org.obscurify.ObscurifyVPN CACHE STRING "OSX Application identifier") + set(BUILD_OSX_APP_IDENTIFIER org.obscurify.DefaultVPN CACHE STRING "OSX Application identifier") endif() if(NOT BUILD_IOS_APP_IDENTIFIER) - set(BUILD_IOS_APP_IDENTIFIER org.obscurify.ObscurifyVPN CACHE STRING "iOS Application identifier") + set(BUILD_IOS_APP_IDENTIFIER org.obscurify.DefaultVPN CACHE STRING "iOS Application identifier") endif() if(NOT BUILD_IOS_GROUP_IDENTIFIER) - set(BUILD_IOS_GROUP_IDENTIFIER group.org.obscurify.ObscurifyVPN CACHE STRING "iOS Group identifier") + set(BUILD_IOS_GROUP_IDENTIFIER group.org.obscurify.DefaultVPN CACHE STRING "iOS Group identifier") endif() if(NOT BUILD_VPN_DEVELOPMENT_TEAM) set(BUILD_VPN_DEVELOPMENT_TEAM KU5NAU9B7H CACHE STRING "Obscurify VPN Development Team") diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake index 1d088440e..6b0325b2b 100644 --- a/client/cmake/ios.cmake +++ b/client/cmake/ios.cmake @@ -80,8 +80,8 @@ set_target_properties(${PROJECT} PROPERTIES # 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 "match AppStore org.obscurify.ObscurifyVPN" - # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.ObscurifyVPN" + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.obscurify.DefaultVPN" + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.DefaultVPN" ) set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_SWIFT_VERSION "5.0" diff --git a/client/ios/app/Info.plist.in b/client/ios/app/Info.plist.in index 2d6e4f771..4cd2bc391 100644 --- a/client/ios/app/Info.plist.in +++ b/client/ios/app/Info.plist.in @@ -46,7 +46,7 @@ UIUserInterfaceStyle Light com.wireguard.ios.app_group_id - group.org.obscurify.ObscurifyVPN + group.org.obscurify.DefaultVPN UIViewControllerBasedStatusBarAppearance NSCameraUsageDescription @@ -74,7 +74,7 @@ UTTypeIconFiles UTTypeIdentifier - org.obscurify.ObscurifyVPN.amnezia-config + org.obscurify.DefaultVPN.amnezia-config UTTypeTagSpecification public.filename-extension @@ -97,7 +97,7 @@ UTTypeIconFiles UTTypeIdentifier - org.obscurify.ObscurifyVPN.wireguard-config + org.obscurify.DefaultVPN.wireguard-config UTTypeTagSpecification public.filename-extension @@ -121,7 +121,7 @@ UTTypeIconFiles UTTypeIdentifier - org.obscurify.ObscurifyVPN.openvpn-config + org.obscurify.DefaultVPN.openvpn-config UTTypeTagSpecification public.filename-extension @@ -140,11 +140,11 @@ public.data UTTypeDescription - ObscurifyVPN backup file + DefaultVPN backup file UTTypeIconFiles UTTypeIdentifier - org.obscurify.ObscurifyVPN.backup-config + org.obscurify.DefaultVPN.backup-config UTTypeTagSpecification public.filename-extension @@ -167,10 +167,10 @@ Alternate LSItemContentTypes - org.obscurify.ObscurifyVPN.amnezia-config - org.obscurify.ObscurifyVPN.wireguard-config - org.obscurify.ObscurifyVPN.openvpn-config - org.obscurify.ObscurifyVPN.backup-config + org.obscurify.DefaultVPN.amnezia-config + org.obscurify.DefaultVPN.wireguard-config + org.obscurify.DefaultVPN.openvpn-config + org.obscurify.DefaultVPN.backup-config diff --git a/client/ios/app/main.entitlements b/client/ios/app/main.entitlements index fa70e821d..f9589b372 100644 --- a/client/ios/app/main.entitlements +++ b/client/ios/app/main.entitlements @@ -8,13 +8,13 @@ com.apple.security.application-groups - group.org.obscurify.ObscurifyVPN + group.org.obscurify.DefaultVPN com.apple.security.files.user-selected.read-write keychain-access-groups - $(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN + $(AppIdentifierPrefix)group.org.obscurify.DefaultVPN diff --git a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements index a28d91eb1..abbb0d1b0 100644 --- a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements +++ b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements @@ -8,11 +8,11 @@ com.apple.security.application-groups - group.org.obscurify.ObscurifyVPN + group.org.obscurify.DefaultVPN keychain-access-groups - $(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN + $(AppIdentifierPrefix)group.org.obscurify.DefaultVPN diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt index bad138efb..741c5f7c0 100644 --- a/client/ios/networkextension/CMakeLists.txt +++ b/client/ios/networkextension/CMakeLists.txt @@ -32,8 +32,8 @@ set_target_properties(networkextension PROPERTIES # XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" # XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual - # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.obscurify.ObscurifyVPN.network-extension" - # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.ObscurifyVPN.network-extension" + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.obscurify.DefaultVPN.network-extension" + # XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.DefaultVPN.network-extension" ) set_target_properties(networkextension PROPERTIES diff --git a/client/main.cpp b/client/main.cpp index bd24c5e54..915ac563e 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -21,7 +21,7 @@ bool isAnotherInstanceRunning() QLocalSocket socket; socket.connectToServer("AmneziaVPNInstance"); if (socket.waitForConnected(500)) { - qWarning() << "ObscurifyVPN is already running"; + qWarning() << "DefaultVPN is already running"; return true; } return false; diff --git a/client/platforms/ios/Log.swift b/client/platforms/ios/Log.swift index ef0a24330..f57fdc3c8 100644 --- a/client/platforms/ios/Log.swift +++ b/client/platforms/ios/Log.swift @@ -14,7 +14,7 @@ struct Log { } } - private static let appGroupID = "group.org.obscurify.ObscurifyVPN" + private static let appGroupID = "group.org.obscurify.DefaultVPN" static let appLogURL = { let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)! diff --git a/client/platforms/macos/macosutils.mm b/client/platforms/macos/macosutils.mm index e7166a8b9..59b9f8d68 100644 --- a/client/platforms/macos/macosutils.mm +++ b/client/platforms/macos/macosutils.mm @@ -21,7 +21,7 @@ if (!appId) { // Fallback. When an unsigned/un-notarized app is executed in // command-line mode, it could fail the fetching of its own bundle id. - appId = @"org.obscurify.ObscurifyVPN"; + appId = @"org.obscurify.DefaultVPN"; } return appId; diff --git a/client/translations/amneziavpn_ar_EG.ts b/client/translations/amneziavpn_ar_EG.ts index 7c2d28e1b..cb6a401ee 100644 --- a/client/translations/amneziavpn_ar_EG.ts +++ b/client/translations/amneziavpn_ar_EG.ts @@ -1920,7 +1920,7 @@ Already installed containers were found on the server. All installed containers - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/client/translations/amneziavpn_fa_IR.ts b/client/translations/amneziavpn_fa_IR.ts index ccb64251e..04e7ce6b3 100644 --- a/client/translations/amneziavpn_fa_IR.ts +++ b/client/translations/amneziavpn_fa_IR.ts @@ -2003,7 +2003,7 @@ Already installed containers were found on the server. All installed containers - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/client/translations/amneziavpn_hi_IN.ts b/client/translations/amneziavpn_hi_IN.ts index ec7f82059..615ee26ae 100644 --- a/client/translations/amneziavpn_hi_IN.ts +++ b/client/translations/amneziavpn_hi_IN.ts @@ -1968,7 +1968,7 @@ Already installed containers were found on the server. All installed containers - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/client/translations/amneziavpn_my_MM.ts b/client/translations/amneziavpn_my_MM.ts index 18fb42075..9f56395fc 100644 --- a/client/translations/amneziavpn_my_MM.ts +++ b/client/translations/amneziavpn_my_MM.ts @@ -1929,7 +1929,7 @@ Already installed containers were found on the server. All installed containers - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/client/translations/amneziavpn_ru_RU.ts b/client/translations/amneziavpn_ru_RU.ts index e86ea6645..68cdc33b0 100644 --- a/client/translations/amneziavpn_ru_RU.ts +++ b/client/translations/amneziavpn_ru_RU.ts @@ -2047,7 +2047,7 @@ Already installed containers were found on the server. All installed containers - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/client/translations/amneziavpn_uk_UA.ts b/client/translations/amneziavpn_uk_UA.ts index 683f8a182..bf41b87d3 100644 --- a/client/translations/amneziavpn_uk_UA.ts +++ b/client/translations/amneziavpn_uk_UA.ts @@ -2121,7 +2121,7 @@ Already installed containers were found on the server. All installed containers - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/client/translations/amneziavpn_ur_PK.ts b/client/translations/amneziavpn_ur_PK.ts index 976461ca6..33eaa1ab4 100644 --- a/client/translations/amneziavpn_ur_PK.ts +++ b/client/translations/amneziavpn_ur_PK.ts @@ -1972,7 +1972,7 @@ Already installed containers were found on the server. All installed containers - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts index 6c262807f..02949406a 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -2068,7 +2068,7 @@ And if you don't like the app, all the more support it - the donation will - ObscurifyVPN-service logs + DefaultVPN-service logs diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh index a6c29b6b5..5734e9b97 100755 --- a/deploy/build_ios.sh +++ b/deploy/build_ios.sh @@ -12,7 +12,7 @@ mkdir -p $BUILD_DIR echo "Project dir: ${PROJECT_DIR}" echo "Build dir: ${BUILD_DIR}" -APP_NAME=ObscurifyVPN +APP_NAME=DefaultVPN APP_FILENAME=$APP_NAME.app APP_DOMAIN=org.amneziavpn.package PLIST_NAME=$APP_NAME.plist diff --git a/deploy/build_linux.sh b/deploy/build_linux.sh index 796221a28..d6a45d1b6 100755 --- a/deploy/build_linux.sh +++ b/deploy/build_linux.sh @@ -23,7 +23,7 @@ mkdir -p $CQTDEPLOYER_DIR echo "Project dir: ${PROJECT_DIR}" echo "Build dir: ${BUILD_DIR}" -APP_NAME=ObscurifyVPN +APP_NAME=DefaultVPN APP_FILENAME=$APP_NAME.app APP_DOMAIN=org.amneziavpn.package diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 63e1696a0..d6247c45c 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -20,7 +20,7 @@ BUILD_DIR=$DEPLOY_DIR/build echo "Project dir: ${PROJECT_DIR}" echo "Build dir: ${BUILD_DIR}" -APP_NAME=ObscurifyVPN +APP_NAME=DefaultVPN APP_FILENAME=$APP_NAME.app APP_DOMAIN=org.amneziavpn.package PLIST_NAME=$APP_NAME.plist diff --git a/deploy/data/linux/AmneziaVPN.service b/deploy/data/linux/AmneziaVPN.service index a74bda97b..8b9087313 100755 --- a/deploy/data/linux/AmneziaVPN.service +++ b/deploy/data/linux/AmneziaVPN.service @@ -1,5 +1,5 @@ [Unit] -Description=ObscurifyVPN Service +Description=DefaultVPN Service After=network.target StartLimitIntervalSec=0 diff --git a/deploy/data/macos/AmneziaVPN.plist b/deploy/data/macos/AmneziaVPN.plist index c725e4fcf..ab6b83d51 100644 --- a/deploy/data/macos/AmneziaVPN.plist +++ b/deploy/data/macos/AmneziaVPN.plist @@ -3,10 +3,10 @@ Label - ObscurifyVPN-service + DefaultVPN-service ProgramArguments - /Applications/ObscurifyVPN.app/Contents/MacOS/ObscurifyVPN-service + /Applications/DefaultVPN.app/Contents/MacOS/DefaultVPN-service KeepAlive diff --git a/deploy/installer/config/macos.xml.in b/deploy/installer/config/macos.xml.in index 00e39b4ae..52e409bbe 100644 --- a/deploy/installer/config/macos.xml.in +++ b/deploy/installer/config/macos.xml.in @@ -1,11 +1,11 @@ - ObscurifyVPN + DefaultVPN @CMAKE_PROJECT_VERSION@ - ObscurifyVPN - ObscurifyVPN - ObscurifyVPN - /Applications/ObscurifyVPN.app + DefaultVPN + DefaultVPN + DefaultVPN + /Applications/DefaultVPN.app 600 380 Mac @@ -21,7 +21,7 @@ https://amneziavpn.org/updates/macos true - ObscurifyVPN - repository for macOS + DefaultVPN - repository for macOS diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt index c05145b02..7bee69116 100644 --- a/service/server/CMakeLists.txt +++ b/service/server/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) -set(PROJECT ObscurifyVPN-service) +set(PROJECT DefaultVPN-service) project(${PROJECT}) set(CMAKE_CXX_STANDARD 20)