Remove VPN configurations after app reset on iOS (#661)
This commit is contained in:
parent
bb7b64fb96
commit
ca633ae882
4 changed files with 31 additions and 2 deletions
|
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
|
||||||
|
|
||||||
set(PROJECT AmneziaVPN)
|
set(PROJECT AmneziaVPN)
|
||||||
|
|
||||||
project(${PROJECT} VERSION 4.4.1.1
|
project(${PROJECT} VERSION 4.4.1.2
|
||||||
DESCRIPTION "AmneziaVPN"
|
DESCRIPTION "AmneziaVPN"
|
||||||
HOMEPAGE_URL "https://amnezia.org/"
|
HOMEPAGE_URL "https://amnezia.org/"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import Foundation
|
import Foundation
|
||||||
|
import NetworkExtension
|
||||||
|
|
||||||
public func swiftUpdateLogData(_ qtString: std.string) -> std.string {
|
public func swiftUpdateLogData(_ qtString: std.string) -> std.string {
|
||||||
let qtLog = Log(String(describing: qtString))
|
let qtLog = Log(String(describing: qtString))
|
||||||
|
|
@ -24,3 +25,26 @@ public func swiftDeleteLog() {
|
||||||
public func toggleLogging(_ isEnabled: Bool) {
|
public func toggleLogging(_ isEnabled: Bool) {
|
||||||
Log.isLoggingEnabled = isEnabled
|
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)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) vpnConfigurationDidChange:(NSNotification *)notification {
|
- (void) vpnConfigurationDidChange:(NSNotification *)notification {
|
||||||
cppController->vpnStatusDidChange(notification);
|
// cppController->vpnStatusDidChange(notification);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,12 @@ void SettingsController::clearSettings()
|
||||||
m_languageModel->changeLanguage(
|
m_languageModel->changeLanguage(
|
||||||
static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
|
static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
|
||||||
m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
|
m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
|
||||||
|
|
||||||
emit changeSettingsFinished(tr("All settings have been reset to default values"));
|
emit changeSettingsFinished(tr("All settings have been reset to default values"));
|
||||||
|
|
||||||
|
#ifdef Q_OS_IOS
|
||||||
|
AmneziaVPN::clearSettings();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsController::clearCachedProfiles()
|
void SettingsController::clearCachedProfiles()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue