diff --git a/CMakeLists.txt b/CMakeLists.txt index 0825cc45..77ec33b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT AmneziaVPN) -project(${PROJECT} VERSION 4.4.1.1 +project(${PROJECT} VERSION 4.4.1.2 DESCRIPTION "AmneziaVPN" HOMEPAGE_URL "https://amnezia.org/" ) diff --git a/client/platforms/ios/LogController.swift b/client/platforms/ios/LogController.swift index 7f32ef43..e10b9ce2 100644 --- a/client/platforms/ios/LogController.swift +++ b/client/platforms/ios/LogController.swift @@ -1,4 +1,5 @@ import Foundation +import NetworkExtension public func swiftUpdateLogData(_ qtString: std.string) -> std.string { let qtLog = Log(String(describing: qtString)) @@ -24,3 +25,26 @@ public func swiftDeleteLog() { public func toggleLogging(_ isEnabled: Bool) { Log.isLoggingEnabled = isEnabled } + +public func clearSettings() { + NETunnelProviderManager.loadAllFromPreferences { managers, error in + if let error { + NSLog("clearSettings removeFromPreferences error: \(error.localizedDescription)") + return + } + + managers?.forEach { manager in + manager.removeFromPreferences { error in + if let error { + NSLog("NE removeFromPreferences error: \(error.localizedDescription)") + } else { + manager.loadFromPreferences { error in + if let error { + NSLog("NE loadFromPreferences after remove error: \(error.localizedDescription)") + } + } + } + } + } + } +} diff --git a/client/platforms/ios/ios_controller_wrapper.mm b/client/platforms/ios/ios_controller_wrapper.mm index 4bbe24dd..79f3bcf9 100644 --- a/client/platforms/ios/ios_controller_wrapper.mm +++ b/client/platforms/ios/ios_controller_wrapper.mm @@ -21,7 +21,7 @@ } - (void) vpnConfigurationDidChange:(NSNotification *)notification { - cppController->vpnStatusDidChange(notification); +// cppController->vpnStatusDidChange(notification); } diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp index 6ec55321..4aa64533 100644 --- a/client/ui/controllers/settingsController.cpp +++ b/client/ui/controllers/settingsController.cpp @@ -152,7 +152,12 @@ void SettingsController::clearSettings() m_languageModel->changeLanguage( static_cast(m_languageModel->getCurrentLanguageIndex())); m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites); + emit changeSettingsFinished(tr("All settings have been reset to default values")); + +#ifdef Q_OS_IOS + AmneziaVPN::clearSettings(); +#endif } void SettingsController::clearCachedProfiles()