update content rules adblocker

AppBuilder/AppBuilder/PrefsUtil.swift

@@ -131,116 +131,32 @@ class PrefsUtil {
     static let contentRulesAds = """
     [
         {
-            "trigger": {
-                "url-filter": ".*ads.*"
+            "trigger": { 
+                "url-filter": ".*(ads|adserver|advert|doubleclick|popads|popcash|onclickads|adfly|shorte).*", 
+                "resource-type": ["script", "image", "stylesheet", "document", "subdocument", "media"]
             },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*doubleclick.*"
-            },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*popads.*"
-            },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*popcash.*"
-            },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*onclickads.*"
-            },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*adfly.*"
-            },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*shorte.*"
-            },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*taboola.*"
-            },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*outbrain.*"
-            },
-            "action": {
-                "type": "block"
-            }
+            "action": { "type": "block" }
         },
         {
-            "trigger": {
-                "url-filter": ".*scorecardresearch.*"
+            "trigger": { 
+                "url-filter": ".*(taboola|outbrain|scorecardresearch|googlesyndication|tracking|track|pixel).*", 
+                "resource-type": ["script", "iframe", "xmlhttprequest"]
             },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*google-analytics.*"
-            },
-            "action": {
-                "type": "block"
-            }
+            "action": { "type": "block" }
         },
         {
-            "trigger": {
-                "url-filter": ".*facebook.com/tr.*"
+            "trigger": { 
+                "url-filter": ".*(google-analytics|facebook.com/tr|analytics|gtag|data-collect|collect).*", 
+                "resource-type": ["script", "xmlhttprequest"]
             },
-            "action": {
-                "type": "block"
-            }
+            "action": { "type": "block" }
         },
         {
-            "trigger": {
-                "url-filter": ".*pixel.*"
+            "trigger": { 
+                "url-filter": ".*(banner|sponsored|clicktrack|beacon|stats|metrics).*", 
+                "resource-type": ["script", "image", "iframe"]
             },
-            "action": {
-                "type": "block"
-            }
-        },
-        {
-            "trigger": {
-                "url-filter": ".*analytics.*"
-            },
-            "action": {
-                "type": "block"
-            }
+            "action": { "type": "block" }
         }
     ]
     """

NexilisLite/NexilisLite/Source/View/BNIView/BNIBookingWebView.swift

@@ -176,116 +176,32 @@ public class BNIBookingWebView: UIViewController, WKNavigationDelegate, UIScroll
         let contentRules = """
         [
             {
-                "trigger": {
-                    "url-filter": ".*ads.*"
+                "trigger": { 
+                    "url-filter": ".*(ads|adserver|advert|doubleclick|popads|popcash|onclickads|adfly|shorte).*", 
+                    "resource-type": ["script", "image", "stylesheet", "document", "subdocument", "media"]
                 },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*doubleclick.*"
-                },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*popads.*"
-                },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*popcash.*"
-                },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*onclickads.*"
-                },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*adfly.*"
-                },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*shorte.*"
-                },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*taboola.*"
-                },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*outbrain.*"
-                },
-                "action": {
-                    "type": "block"
-                }
+                "action": { "type": "block" }
             },
             {
-                "trigger": {
-                    "url-filter": ".*scorecardresearch.*"
+                "trigger": { 
+                    "url-filter": ".*(taboola|outbrain|scorecardresearch|googlesyndication|tracking|track|pixel).*", 
+                    "resource-type": ["script", "iframe", "xmlhttprequest"]
                 },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*google-analytics.*"
-                },
-                "action": {
-                    "type": "block"
-                }
+                "action": { "type": "block" }
             },
             {
-                "trigger": {
-                    "url-filter": ".*facebook.com/tr.*"
+                "trigger": { 
+                    "url-filter": ".*(google-analytics|facebook.com/tr|analytics|gtag|data-collect|collect).*", 
+                    "resource-type": ["script", "xmlhttprequest"]
                 },
-                "action": {
-                    "type": "block"
-                }
+                "action": { "type": "block" }
             },
             {
-                "trigger": {
-                    "url-filter": ".*pixel.*"
+                "trigger": { 
+                    "url-filter": ".*(banner|sponsored|clicktrack|beacon|stats|metrics).*", 
+                    "resource-type": ["script", "image", "iframe"]
                 },
-                "action": {
-                    "type": "block"
-                }
-            },
-            {
-                "trigger": {
-                    "url-filter": ".*analytics.*"
-                },
-                "action": {
-                    "type": "block"
-                }
+                "action": { "type": "block" }
             }
         ]
         """