Merge pull request #510 in ADGUARD-IOS/adguard-ios from enhancement/1…

…276_3 to v3.2

* commit '0b2739af5b818a5ee151e14672d21c73ab04ec96':
  fixed
  fixed
  search added
  fix
  fix
  fix
  wifi exceptions
  insets fixed
  small fix
  system whitelist and blacklist merged
  small fixes
  wifi-exceptions screen
  changed model

AdguardExtension/Adguard.entitlements

@@ -10,6 +10,8 @@
 		<string>content-filter-provider</string>
 		<string>packet-tunnel-provider</string>
 	</array>
+	<key>com.apple.developer.networking.wifi-info</key>
+	<true/>
 	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
 	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 	<key>com.apple.security.application-groups</key>

AdguardExtension/AdguardApp/AppDelegateHelper.swift

@@ -152,7 +152,7 @@ class AppDelegateHelper: NSObject {
                         let userFilterStoryboard = UIStoryboard(name: "UserFilter", bundle: Bundle.main)
                         guard let userFilterController = userFilterStoryboard.instantiateViewController(withIdentifier: "UserFilterController") as? ListOfRulesController else { return }
 
-                        let model = ListOfRulesModel(listOfRulesType: .safariUserFilter, resources: self.resources, contentBlockerService: self.contentBlockerService, antibanner: antibanner, theme: self.themeService, dnsFiltersService: self.dnsFiltersService)
+                        let model: ListOfRulesModelProtocol = UserFilterModel(resources: self.resources, contentBlockerService: self.contentBlockerService, antibanner: self.antibanner, theme: self.themeService)
 
                         userFilterController.model = model
                         userFilterController.newRuleText = path

AdguardExtension/AdguardApp/Assets.xcassets/check.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "check.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

AdguardExtension/AdguardApp/Assets.xcassets/main menu/custom.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "custom.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

AdguardExtension/AdguardApp/Assets.xcassets/mobiledata.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mobiledata.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

AdguardExtension/AdguardApp/Services/APVPNManager.h

@@ -20,7 +20,6 @@
 #import "APSharedResources.h"
 
 
-
 @class  ASDFilterRule, DnsProviderInfo, DnsServerInfo, ConfigurationService;
 
 /////////////////////////////////////////////////////////////////////
@@ -103,6 +102,16 @@ extern NSString* __nonnull APVpnChangedNotification;
  */
 @property (readonly) BOOL vpnInstalled;
 
+/**
+this flag indicates that filtering of Wi-Fi data is on/off
+*/
+@property BOOL filteringWifiDataEnabled;
+
+/**
+this flag indicates that filtering of mobile data is on/off
+*/
+@property BOOL filteringMobileDataEnabled;
+
 /**
  Adds custom (editable) DNS server.
  

AdguardExtension/AdguardApp/Services/APVPNManager.m

@@ -58,12 +58,16 @@ @implementation APVPNManager{
     APVpnManagerTunnelMode _tunnelMode;
     NSNumber          *_delayedSetTunnelMode;
 
-    BOOL          _delayedRestartByReachability;
-    BOOL          _delayedRestartTunnel;
+    NSNumber          *_delayedRestartByReachability;
+    BOOL              _delayedRestartTunnel;
+    NSNumber          *_delayedFilteringWifiDataEnabled;
+    NSNumber          *_delayedFilteringMobileDataEnabled;
 
     NSError     *_standartError;
 
     BOOL _restartByReachability;
+    BOOL _filteringWifiDataEnabled;
+    BOOL _filteringMobileDataEnabled;
 
     NSMutableArray <DnsProviderInfo *> *_customDnsProviders;
 
@@ -142,6 +146,9 @@ - (id)initWithResources: (nonnull APSharedResources*) resources
         // don't restart by default
         _restartByReachability = NO;
 
+        _filteringMobileDataEnabled = YES;
+        _filteringWifiDataEnabled = YES;
+
         [self loadConfiguration];
     }
 
@@ -213,7 +220,6 @@ - (void)setActiveDnsServer:(DnsServerInfo *)activeDnsServer{
     }
 
     [_busyLock unlock];
-
 }
 
 - (NSArray<DnsProviderInfo *> *)providers {
@@ -308,6 +314,15 @@ - (BOOL)restartByReachability {
     return _restartByReachability;
 }
 
+- (BOOL)filteringWifiDataEnabled {
+    return _filteringWifiDataEnabled;
+}
+
+- (BOOL)filteringMobileDataEnabled {
+    return _filteringMobileDataEnabled;
+}
+
+
 - (void)setRestartByReachability:(BOOL)restartByReachability {
 
     _lastError = nil;
@@ -316,13 +331,13 @@ - (void)setRestartByReachability:(BOOL)restartByReachability {
 
     if (_busy) {
 
-        _delayedRestartByReachability = restartByReachability;
+        _delayedRestartByReachability = @(restartByReachability);
     } else {
         dispatch_async(workingQueue, ^{
 
             if (_busy) {
 
-                _delayedRestartByReachability = restartByReachability;
+                _delayedRestartByReachability = @(restartByReachability);
             } else {
 
                 [self internalSetRestartByReachability:restartByReachability];
@@ -333,6 +348,48 @@ - (void)setRestartByReachability:(BOOL)restartByReachability {
      [_busyLock unlock];
 }
 
+- (void)setFilteringWifiDataEnabled:(BOOL)filteringWifiDataEnabled {
+    _lastError = nil;
+
+    [_busyLock lock];
+
+    if (_busy) {
+        _delayedFilteringWifiDataEnabled = @(filteringWifiDataEnabled);
+    } else {
+        dispatch_async(workingQueue, ^{
+            if (_busy) {
+                _delayedFilteringWifiDataEnabled = @(filteringWifiDataEnabled);
+            } else {
+
+                [self internalSetFilteringWifiDataEnabled:filteringWifiDataEnabled];
+            }
+        });
+    }
+
+     [_busyLock unlock];
+}
+
+- (void)setFilteringMobileDataEnabled:(BOOL)filteringMobileDataEnabled {
+    _lastError = nil;
+
+    [_busyLock lock];
+
+    if (_busy) {
+        _delayedFilteringMobileDataEnabled = @(filteringMobileDataEnabled);
+    } else {
+        dispatch_async(workingQueue, ^{
+            if (_busy) {
+                _delayedFilteringMobileDataEnabled = @(filteringMobileDataEnabled);
+            } else {
+
+                [self internalSetFilteringMobileDataEnabled:filteringMobileDataEnabled];
+            }
+        });
+    }
+
+     [_busyLock unlock];
+}
+
 - (APVpnManagerTunnelMode)tunnelMode {
     return _tunnelMode;
 }
@@ -520,9 +577,7 @@ - (void)internalSetEnabled:(BOOL)enabled force:(BOOL)force{
             _delayedSetEnabled = @(enabled);
             return;
         }
-
-
-        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:_tunnelMode restartByReachability:_restartByReachability enabled:enabled];
+        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:_tunnelMode restartByReachability:_restartByReachability enabled:enabled filteringMobileDataEnabled:_filteringMobileDataEnabled filteringWifiDataEnabled:_filteringWifiDataEnabled];
 
         // If do not completely stop the tunnel in full mode, then other VPNs can not start
         if(!enabled && _tunnelMode == APVpnManagerTunnelModeFull) {
@@ -546,7 +601,7 @@ - (void)internalSetRemoteServer:(DnsServerInfo *)server{
         if (_enabled) {
             _delayedSetEnabled = @(_enabled);
         }
-        [self updateConfigurationForRemoteServer:server tunnelMode:_tunnelMode restartByReachability:_restartByReachability enabled:NO];
+        [self updateConfigurationForRemoteServer:server tunnelMode:_tunnelMode restartByReachability:_restartByReachability enabled:NO filteringMobileDataEnabled:_filteringMobileDataEnabled filteringWifiDataEnabled:_filteringWifiDataEnabled];
     }
 }
 
@@ -557,7 +612,7 @@ - (void)internalSetTunnelMode:(APVpnManagerTunnelMode)tunnelMode {
         if (_enabled) {
             _delayedSetEnabled = @(_enabled);
         }
-        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:tunnelMode restartByReachability:_restartByReachability enabled:NO];
+        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:tunnelMode restartByReachability:_restartByReachability enabled:NO filteringMobileDataEnabled:_filteringMobileDataEnabled filteringWifiDataEnabled:_filteringWifiDataEnabled];
     }
 }
 
@@ -569,7 +624,29 @@ - (void)internalSetRestartByReachability:(BOOL)restart {
         if (_enabled) {
             _delayedSetEnabled = @(_enabled);
         }
-        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:_tunnelMode restartByReachability:restart enabled:NO];
+        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:_tunnelMode restartByReachability:restart enabled:NO filteringMobileDataEnabled:_filteringMobileDataEnabled filteringWifiDataEnabled:_filteringWifiDataEnabled];
+    }
+}
+
+//must be called on workingQueue
+- (void)internalSetFilteringWifiDataEnabled:(BOOL)enabled {
+
+    if (enabled != _filteringWifiDataEnabled) {
+        if (_enabled) {
+            _delayedSetEnabled = @(_enabled);
+        }
+        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:_tunnelMode restartByReachability:_restartByReachability enabled:NO filteringMobileDataEnabled:_filteringMobileDataEnabled filteringWifiDataEnabled:enabled];
+    }
+}
+
+//must be called on workingQueue
+- (void)internalSetFilteringMobileDataEnabled:(BOOL)enabled {
+
+    if (enabled != _filteringMobileDataEnabled) {
+        if (_enabled) {
+            _delayedSetEnabled = @(_enabled);
+        }
+        [self updateConfigurationForRemoteServer:_activeDnsServer tunnelMode:_tunnelMode restartByReachability:_restartByReachability enabled:NO filteringMobileDataEnabled:enabled filteringWifiDataEnabled:_filteringWifiDataEnabled];
     }
 }
 
@@ -599,7 +676,7 @@ - (void)loadConfiguration{
                                 DDLogError(@"(APVPNManager) Error. Manager removing failed with error: %@", error.localizedDescription);
                             }
                             else {
-                                DDLogInfo(@"(APVPNManager) Error. Manager successfully removed");
+                                DDLogInfo(@"(APVPNManager). Manager successfully removed");
                             }
                         }];
                     }
@@ -636,8 +713,11 @@ - (void)loadConfiguration{
 
 }
 
-- (void)updateConfigurationForRemoteServer:(DnsServerInfo *)remoteServer tunnelMode:(APVpnManagerTunnelMode) tunnelMode restartByReachability:(BOOL)restartByReachability enabled:(BOOL)enabled{
-
+- (void)updateConfigurationForRemoteServer:(DnsServerInfo *)remoteServer tunnelMode:(APVpnManagerTunnelMode) tunnelMode restartByReachability:(BOOL)restartByReachability
+    enabled:(BOOL)enabled
+    filteringMobileDataEnabled:(BOOL)filteringMobileDataEnabled
+    filteringWifiDataEnabled:(BOOL)filteringWifiDataEnabled {
+
     [_busyLock lock];
     _busy = YES;
     [_busyLock unlock];
@@ -660,7 +740,9 @@ - (void)updateConfigurationForRemoteServer:(DnsServerInfo *)remoteServer tunnelM
     protocol.providerConfiguration = @{
                                        APVpnManagerParameterRemoteDnsServer: remoteServerData,
                                        APVpnManagerParameterTunnelMode: @(tunnelMode),
-                                       APVpnManagerRestartByReachability : @(restartByReachability)
+                                       APVpnManagerRestartByReachability : @(restartByReachability),
+                                       APVpnManagerFilteringMobileDataEnabled: @(filteringMobileDataEnabled),
+                                       APVpnManagerFilteringWifiDataEnabled:@(filteringWifiDataEnabled)
                                        };
 
     if (_manager) {
@@ -694,7 +776,7 @@ - (void)updateConfigurationForRemoteServer:(DnsServerInfo *)remoteServer tunnelM
                 [self setStatuses];
             });
 
-            DDLogInfo(@"(APVPNManager) Updating vpn conviguration failured: %@",
+            DDLogInfo(@"(APVPNManager) Updating vpn conviguration failed: %@",
                       (self.activeDnsServer.name ?: @"None"));
 
             [self sendNotificationForced:NO];
@@ -754,7 +836,7 @@ - (void)setStatuses{
         NSData *remoteDnsServerData = protocolConfiguration.providerConfiguration[APVpnManagerParameterRemoteDnsServer];
 
         // Getting current settings from configuration.
-        //If settings are incorrect, then we assign default values.
+        // If settings are incorrect, then we assign default values.
         DnsServerInfo *remoteServer = [NSKeyedUnarchiver unarchiveObjectWithData:remoteDnsServerData];
         if (_activeDnsServer.serverId != remoteServer.serverId) {
             [self willChangeValueForKey:@"activeDnsServer"];
@@ -774,8 +856,15 @@ - (void)setStatuses{
 
         _restartByReachability = protocolConfiguration.providerConfiguration[APVpnManagerRestartByReachability] ?
         [protocolConfiguration.providerConfiguration[APVpnManagerRestartByReachability] boolValue] : NO; // NO by default
+
+        _filteringMobileDataEnabled = protocolConfiguration.providerConfiguration[APVpnManagerFilteringMobileDataEnabled] ? [protocolConfiguration.providerConfiguration[APVpnManagerFilteringMobileDataEnabled] boolValue] : YES; // YES by default
+
+        _filteringWifiDataEnabled = protocolConfiguration.providerConfiguration[APVpnManagerFilteringWifiDataEnabled] ? [protocolConfiguration.providerConfiguration[APVpnManagerFilteringWifiDataEnabled] boolValue] : YES; // YES by default
+
         // Save to user defaults
         [_resources.sharedDefaults setBool:_restartByReachability forKey:AEDefaultsRestartByReachability];
+        [_resources.sharedDefaults setBool:_filteringMobileDataEnabled forKey:AEDefaultsFilterMobileEnabled];
+        [_resources.sharedDefaults setBool:_filteringWifiDataEnabled forKey:AEDefaultsFilterWifiEnabled];
 
         NSString *connectionStatusReason = @"Unknown";
 
@@ -914,6 +1003,9 @@ - (void)startDelayedOperationsIfNeedIt{
             _delayedSetEnabled = nil;
             _delayedSetActiveDnsServer = nil;
             _delayedSetTunnelMode = nil;
+            _delayedFilteringMobileDataEnabled = nil;
+            _delayedFilteringWifiDataEnabled = nil;
+            _delayedRestartByReachability = nil;
         }
 
         int localValue = 0;
@@ -946,6 +1038,27 @@ - (void)startDelayedOperationsIfNeedIt{
                 [self restartTunnel];
             });
         }
+        else if (_delayedFilteringMobileDataEnabled) {
+            BOOL mobileEnabled = [_delayedFilteringMobileDataEnabled boolValue];
+            _delayedFilteringMobileDataEnabled = nil;
+            dispatch_async(workingQueue, ^{
+                 [self internalSetFilteringMobileDataEnabled:mobileEnabled];
+             });
+        }
+        else if (_delayedFilteringWifiDataEnabled) {
+            BOOL wifiEnabled = [_delayedFilteringWifiDataEnabled boolValue];
+            _delayedFilteringWifiDataEnabled = nil;
+            dispatch_async(workingQueue, ^{
+                 [self internalSetFilteringWifiDataEnabled:wifiEnabled];
+             });
+        }
+        else if (_delayedRestartByReachability) {
+            BOOL restartEnabled = [_delayedRestartByReachability boolValue];
+            _delayedRestartByReachability = nil;
+            dispatch_async(workingQueue, ^{
+                 [self internalSetRestartByReachability:restartEnabled];
+             });
+        }
     }
 
     [_busyLock unlock];

AdguardExtension/AdguardApp/Services/DnsFiltersService.swift

@@ -131,7 +131,7 @@ class DnsFiltersService: NSObject, DnsFiltersServiceProtocol {
                 return []
             }
 
-            return string.components(separatedBy: .newlines)
+            return string.isEmpty ? [] : string.components(separatedBy: .newlines)
         }
         set {
             if let data = newValue.joined(separator: "\n").data(using: .utf8) {
@@ -157,7 +157,7 @@ class DnsFiltersService: NSObject, DnsFiltersServiceProtocol {
                 return []
             }
 
-            return string.components(separatedBy: .newlines)
+            return string.isEmpty ? [] : string.components(separatedBy: .newlines)
         }
         set {
             if let data = newValue.joined(separator: "\n").data(using: .utf8) {