change to default vpn app name

amnezia-vpn · Dec 9, 2024 · 76b1899 · 76b1899
1 parent 509cbca
commit 76b1899
Show file tree

Hide file tree

Showing 27 changed files with 75 additions and 75 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -46,7 +46,7 @@
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
 	<key>com.wireguard.ios.app_group_id</key>
-	<string>group.org.obscurify.ObscurifyVPN</string>
+	<string>group.org.obscurify.DefaultVPN</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
@@ -74,7 +74,7 @@
 			<key>UTTypeIconFiles</key>
 			<array/>
 			<key>UTTypeIdentifier</key>
-			<string>org.obscurify.ObscurifyVPN.amnezia-config</string>
+			<string>org.obscurify.DefaultVPN.amnezia-config</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>
@@ -97,7 +97,7 @@
                         <key>UTTypeIconFiles</key>
                         <array/>
                         <key>UTTypeIdentifier</key>
-                        <string>org.obscurify.ObscurifyVPN.wireguard-config</string>
+                        <string>org.obscurify.DefaultVPN.wireguard-config</string>
                         <key>UTTypeTagSpecification</key>
                         <dict>
                                 <key>public.filename-extension</key>
@@ -121,7 +121,7 @@
                         <key>UTTypeIconFiles</key>
                         <array/>
                         <key>UTTypeIdentifier</key>
-                        <string>org.obscurify.ObscurifyVPN.openvpn-config</string>
+                        <string>org.obscurify.DefaultVPN.openvpn-config</string>
                         <key>UTTypeTagSpecification</key>
                         <dict>
                                 <key>public.filename-extension</key>
@@ -140,11 +140,11 @@
                                 <string>public.data</string>
                         </array>
                         <key>UTTypeDescription</key>
-                        <string>ObscurifyVPN backup file</string>
+                        <string>DefaultVPN backup file</string>
                         <key>UTTypeIconFiles</key>
                         <array/>
                         <key>UTTypeIdentifier</key>
-                        <string>org.obscurify.ObscurifyVPN.backup-config</string>
+                        <string>org.obscurify.DefaultVPN.backup-config</string>
                         <key>UTTypeTagSpecification</key>
                         <dict>
                                 <key>public.filename-extension</key>
@@ -167,10 +167,10 @@
                         <string>Alternate</string>
                         <key>LSItemContentTypes</key>
                         <array>
-                                <string>org.obscurify.ObscurifyVPN.amnezia-config</string>
-                                <string>org.obscurify.ObscurifyVPN.wireguard-config</string>
-                                <string>org.obscurify.ObscurifyVPN.openvpn-config</string>
-                                <string>org.obscurify.ObscurifyVPN.backup-config</string>
+                                <string>org.obscurify.DefaultVPN.amnezia-config</string>
+                                <string>org.obscurify.DefaultVPN.wireguard-config</string>
+                                <string>org.obscurify.DefaultVPN.openvpn-config</string>
+                                <string>org.obscurify.DefaultVPN.backup-config</string>
                         </array>
                 </dict>
         </array>

diff --git a/client/ios/app/main.entitlements b/client/ios/app/main.entitlements
@@ -8,13 +8,13 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.obscurify.ObscurifyVPN</string>
+		<string>group.org.obscurify.DefaultVPN</string>
 	</array>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN</string>
+		<string>$(AppIdentifierPrefix)group.org.obscurify.DefaultVPN</string>
 	</array>
 </dict>
 </plist>
diff --git a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements
@@ -8,11 +8,11 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.obscurify.ObscurifyVPN</string>
+		<string>group.org.obscurify.DefaultVPN</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN</string>
+		<string>$(AppIdentifierPrefix)group.org.obscurify.DefaultVPN</string>
 	</array>
 </dict>
 </plist>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1920,7 +1920,7 @@ Already installed containers were found on the server. All installed containers
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="208"/>
-        <source>ObscurifyVPN-service logs</source>
+        <source>DefaultVPN-service logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git 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
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="208"/>
-        <source>ObscurifyVPN-service logs</source>
+        <source>DefaultVPN-service logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git 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
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="208"/>
-        <source>ObscurifyVPN-service logs</source>
+        <source>DefaultVPN-service logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git 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
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="208"/>
-        <source>ObscurifyVPN-service logs</source>
+        <source>DefaultVPN-service logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git 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
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="208"/>
-        <source>ObscurifyVPN-service logs</source>
+        <source>DefaultVPN-service logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git 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
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="208"/>
-        <source>ObscurifyVPN-service logs</source>
+        <source>DefaultVPN-service logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git 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
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="208"/>
-        <source>ObscurifyVPN-service logs</source>
+        <source>DefaultVPN-service logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>