Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #220 in ADGUARD-IOS/adguard-ios from bug/946 to ma…
…ster

Squashed commit of the following:

commit 73ef91d22415b366263d1f2d20ccf284d89ea3ea
Author: Ivan Ilin <i.ilin@adguard.com>
Date:   Fri Apr 26 19:35:07 2019 +0300

    Add Error message when deleted VPN configuration from iOS settings
    #946
  • Loading branch information
IvanIin committed Apr 28, 2019
1 parent 8e46b6a commit efd3b3a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
Expand Up @@ -47,6 +47,15 @@ class DnsSettingsController : UITableViewController{
}
}

NotificationCenter.default.addObserver(forName: NSNotification.Name.APVpnChanged, object: nil, queue: nil) {
[weak self] (notification) in
guard let sSelf = self else { return }
sSelf.enabledSwitch.isOn = sSelf.vpnManager.enabled
if sSelf.vpnManager.lastError != nil {
ACSSystemUtils.showSimpleAlert(for: sSelf, withTitle: nil, message: sSelf.vpnManager.lastError?.localizedDescription)
}
}

self.updateUI()

updateTheme()
Expand Down
Binary file modified AdguardExtension/AdguardApp/en.lproj/Localizable.strings
Binary file not shown.
5 changes: 1 addition & 4 deletions AdguardExtension/AdguardPro/Services/APVPNManager.m
Expand Up @@ -121,10 +121,7 @@ - (id)initWithResources: (nonnull APSharedResources*) resources {
code:APVPN_MANAGER_ERROR_STANDART
userInfo:@{
NSLocalizedDescriptionKey : ACLocalizedString(
@"support_vpn_configuration_problem",
@"(APVPNManager) PRO version. Error, which may "
@"occur in DNS Filtering module. When user turns on "
@"DNS Filtering functionality.")
@"support_vpn_configuration_problem", nil)
}];

[self initDefinitions];
Expand Down

0 comments on commit efd3b3a

Please sign in to comment.