diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake index a262942d..617bee25 100644 --- a/client/cmake/ios.cmake +++ b/client/cmake/ios.cmake @@ -56,8 +56,8 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/ios/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_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}" MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}" MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLE_PROJECT_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}" @@ -66,8 +66,8 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/ios/app/main.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" diff --git a/client/core/controllers/coreController.cpp b/client/core/controllers/coreController.cpp index 82232c99..d034e408 100644 --- a/client/core/controllers/coreController.cpp +++ b/client/core/controllers/coreController.cpp @@ -195,9 +195,9 @@ void CoreController::initAppleController() emit m_settingsController->importBackupFromOutside(filePath); }); - QTimer::singleShot(0, this, [this]() { AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); }); + QTimer::singleShot(0, this, [this]() { DefaultVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); }); - connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { AmneziaVPN::toggleScreenshots(enabled); }); + connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { DefaultVPN::toggleScreenshots(enabled); }); #endif } diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt index 64896c23..eecd9759 100644 --- a/client/ios/networkextension/CMakeLists.txt +++ b/client/ios/networkextension/CMakeLists.txt @@ -8,8 +8,8 @@ set_target_properties(networkextension PROPERTIES BUNDLE_EXTENSION appex MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in - MACOSX_BUNDLE_INFO_STRING "AmneziaVPNNetworkExtension" - MACOSX_BUNDLE_BUNDLE_NAME "AmneziaVPNNetworkExtension" + MACOSX_BUNDLE_INFO_STRING "DefaultVPNNetworkExtension" + MACOSX_BUNDLE_BUNDLE_NAME "DefaultVPNNetworkExtension" MACOSX_BUNDLE_GUI_IDENTIFIER "${BUILD_IOS_APP_IDENTIFIER}.network-extension" MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}" MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLE_PROJECT_VERSION}-${CMAKE_PROJECT_VERSION_TWEAK}" @@ -19,7 +19,7 @@ set_target_properties(networkextension PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/AmneziaVPNNetworkExtension.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" diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp index f4e3d83d..35a737b5 100644 --- a/client/ui/controllers/settingsController.cpp +++ b/client/ui/controllers/settingsController.cpp @@ -77,7 +77,7 @@ void SettingsController::toggleLogging(bool enable) { m_settings->setSaveLogs(enable); #ifdef Q_OS_IOS - AmneziaVPN::toggleLogging(enable); + DefaultVPN::toggleLogging(enable); #endif if (enable == true) { qInfo().noquote() << QString("Logging has enabled on %1 version %2 %3").arg(APPLICATION_NAME, APP_VERSION, GIT_COMMIT_HASH); @@ -170,7 +170,7 @@ void SettingsController::clearSettings() emit changeSettingsFinished(tr("All settings have been reset to default values")); #ifdef Q_OS_IOS - AmneziaVPN::clearSettings(); + DefaultVPN::clearSettings(); #endif } diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp index 7cde28b4..8f977147 100644 --- a/client/ui/models/servers_model.cpp +++ b/client/ui/models/servers_model.cpp @@ -766,7 +766,7 @@ void ServersModel::removeApiConfig(const int serverIndex) .arg(serverConfig[config_key::hostName].toString()) .arg(serverConfig[config_key::vpnproto].toString()); - AmneziaVPN::removeVPNC(vpncName.toStdString()); + DefaultVPN::removeVPNC(vpncName.toStdString()); #endif serverConfig.remove(config_key::dns1); diff --git a/common/logger/logger.cpp b/common/logger/logger.cpp index 747590b9..08e5c148 100644 --- a/common/logger/logger.cpp +++ b/common/logger/logger.cpp @@ -151,7 +151,7 @@ QString Logger::getLogFile() QString qtLog = file.readAll(); #ifdef Q_OS_IOS - return QString().fromStdString(AmneziaVPN::swiftUpdateLogData(qtLog.toStdString())); + return QString().fromStdString(DefaultVPN::swiftUpdateLogData(qtLog.toStdString())); #else return qtLog; #endif @@ -166,7 +166,7 @@ QString Logger::getServiceLogFile() QString qtLog = file.readAll(); #ifdef Q_OS_IOS - return QString().fromStdString(AmneziaVPN::swiftUpdateLogData(qtLog.toStdString())); + return QString().fromStdString(DefaultVPN::swiftUpdateLogData(qtLog.toStdString())); #else return qtLog; #endif @@ -197,7 +197,7 @@ void Logger::clearLogs(bool isServiceLogger) file.close(); #ifdef Q_OS_IOS - AmneziaVPN::swiftDeleteLog(); + DefaultVPN::swiftDeleteLog(); #endif if (isLogActive) {