Skip to content

Commit

Permalink
Merge branch 'develop' into sam/netp-waitlist-final-touches
Browse files Browse the repository at this point in the history 
# By Anh Do (1) and others
# Via Bartek Waresiak (2) and GitHub (1)
* develop:
  update theme to use system colours (#2180)
  Release 7.99.0 (#2205)
  Update iOS privacy defaults (#2185)
  Remove disabled switches from VPN Settings screen (#2203)
  Update BSK for VPN settings (#2165)
  Fix migrating from Bookmarks V2 and older (#2196)
  Autofill pixel parameter removed (#2182)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
  • Loading branch information
@samsymons
samsymons committed Nov 29, 2023
2 parents 90598ed + 59dbb74 commit 9e7e64c
Show file tree
Hide file tree
Showing 42 changed files with 1,309 additions and 1,018 deletions.
2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 7.97.1
MARKETING_VERSION = 7.99.0
4 changes: 2 additions & 2 deletions Core/AppPrivacyConfigurationDataProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import BrowserServicesKit
final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"b8a321aec612923a53b958fbdbfa541e\""
public static let embeddedDataSHA = "af271d73da0863e678670fb0d9cf4f8269ddb7e584599bfb57d5a370961dbc4b"
public static let embeddedDataETag = "\"7c6169d648700908e0dfc5904d640c37\""
public static let embeddedDataSHA = "e3cd448b68a22fe6c9563deeb4c7d2a62ae947bc655ff33b3fc030bba766672c"
}

public var embeddedDataEtag: String {
Expand Down
4 changes: 2 additions & 2 deletions Core/AppTrackerDataSetProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import BrowserServicesKit
final public class AppTrackerDataSetProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"3a50d09fd78a893f1a284051d1f777de\""
public static let embeddedDataSHA = "2c1995807a61fd9fa311baab01633411282759732f098765f5380bda5e92b9e2"
public static let embeddedDataETag = "\"b879198dd7dcd9e5f1e5ce0a5d4ba782\""
public static let embeddedDataSHA = "0006b1b27b94f5006ba2576f96dd8c7ab0e66943b5556458ea99002aeb80ac1a"
}

public var embeddedDataEtag: String {
Expand Down
2 changes: 0 additions & 2 deletions Core/Pixel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ public struct PixelParameters {
public static let returnUserErrorCode = "error_code"
public static let returnUserOldATB = "old_atb"
public static let returnUserNewATB = "new_atb"

public static let autofillDefaultState = "default_state"
}

public struct PixelValues {
Expand Down
163 changes: 129 additions & 34 deletions Core/ios-config.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"readme": "https://github.com/duckduckgo/privacy-configuration",
"version": 1700585688784,
"version": 1701253939396,
"features": {
"adClickAttribution": {
"readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
Expand Down Expand Up @@ -1251,6 +1251,9 @@
{
"domain": "formula1.com"
},
{
"domain": "gigisplayhouse.org"
},
{
"domain": "hulu.com"
},
Expand Down Expand Up @@ -1293,7 +1296,7 @@
},
"exceptions": [],
"state": "enabled",
"hash": "b101ded240bc51fce0ece83191b2da62"
"hash": "4c62237a3eeaf9cfec814fc3fb7af282"
},
"duckPlayer": {
"exceptions": [],
Expand Down Expand Up @@ -1670,10 +1673,6 @@
"selector": "[class*='container--ads']",
"type": "hide-empty"
},
{
"selector": "[class*='l-ad']",
"type": "hide-empty"
},
{
"selector": "[class*='page-ad']",
"type": "hide-empty"
Expand Down Expand Up @@ -1878,6 +1877,22 @@
"upgrade to flickr pro to hide these ads"
],
"domains": [
{
"domain": "3bmeteo.com",
"rules": [
{
"type": "disable-default"
},
{
"selector": "#admasthead",
"type": "hide-empty"
},
{
"selector": "#ads_container",
"type": "hide-empty"
}
]
},
{
"domain": "abc.es",
"rules": [
Expand Down Expand Up @@ -2655,6 +2670,22 @@
}
]
},
{
"domain": "kentonline.co.uk",
"rules": [
{
"type": "disable-default"
},
{
"selector": "[id*='p_mpu']",
"type": "closest-empty"
},
{
"selector": "[id*='p_dmp']",
"type": "closest-empty"
}
]
},
{
"domain": "komputerswiat.pl",
"rules": [
Expand Down Expand Up @@ -3254,6 +3285,18 @@
}
]
},
{
"domain": "startpagina.nl",
"rules": [
{
"type": "disable-default"
},
{
"selector": ".ad-widget",
"type": "closest-empty"
}
]
},
{
"domain": "takealot.com",
"rules": [
Expand Down Expand Up @@ -3704,7 +3747,7 @@
]
},
"state": "enabled",
"hash": "c747ff47f18924f7ddde7cea3874e3bc"
"hash": "f7c00905a329790def09ac2296a0e1da"
},
"exceptionHandler": {
"exceptions": [
Expand Down Expand Up @@ -4024,9 +4067,6 @@
"gpc": {
"state": "enabled",
"exceptions": [
{
"domain": "abcnews.go.com"
},
{
"domain": "allegiantair.com"
},
Expand Down Expand Up @@ -4079,7 +4119,7 @@
"privacy-test-pages.site"
]
},
"hash": "9f8ae6a01924a47b3ca6ce18f001cbd9"
"hash": "d11962aceb1417d05e8f2854d5fb72a9"
},
"harmfulApis": {
"settings": {
Expand Down Expand Up @@ -4546,16 +4586,6 @@
}
]
},
"adserver.adtech.advertising.com": {
"rules": [
{
"rule": "adserver.adtech.advertising.com/pubapi/3.0/1/54669.7/0/0/ADTECH;v=2;cmd=bid;cors=yes",
"domains": [
"collider.com"
]
}
]
},
"adswizz.com": {
"rules": [
{
Expand Down Expand Up @@ -4584,6 +4614,16 @@
}
]
},
"advertising.com": {
"rules": [
{
"rule": "adserver.adtech.advertising.com/pubapi/3.0/1/54669.7/0/0/ADTECH;v=2;cmd=bid;cors=yes",
"domains": [
"collider.com"
]
}
]
},
"ahacdn.me": {
"rules": [
{
Expand Down Expand Up @@ -5106,6 +5146,16 @@
}
]
},
"datadoghq-browser-agent.com": {
"rules": [
{
"rule": "www.datadoghq-browser-agent.com/datadog-logs-v4.js",
"domains": [
"shapermint.com"
]
}
]
},
"datadome.co": {
"rules": [
{
Expand Down Expand Up @@ -5353,6 +5403,12 @@
},
"facebook.net": {
"rules": [
{
"rule": "connect.facebook.net/en_UK/sdk.js",
"domains": [
"globalcyclingnetwork.com"
]
},
{
"rule": "connect.facebook.net/en_US/sdk.js",
"domains": [
Expand Down Expand Up @@ -5624,6 +5680,7 @@
"rule": "imasdk.googleapis.com/js/sdkloader/ima3.js",
"domains": [
"bloomberg.com",
"gamak.tv",
"games.washingtonpost.com",
"metro.co.uk",
"nfl.com",
Expand Down Expand Up @@ -5845,6 +5902,22 @@
}
]
},
"gorgias.chat": {
"rules": [
{
"rule": "config.gorgias.chat",
"domains": [
"help.athleticbrewing.com"
]
},
{
"rule": "assets.gorgias.chat",
"domains": [
"help.athleticbrewing.com"
]
}
]
},
"greylabeldelivery.com": {
"rules": [
{
Expand Down Expand Up @@ -6132,17 +6205,6 @@
}
]
},
"live.primis.tech": {
"rules": [
{
"rule": "live.primis.tech/live/liveView.php",
"domains": [
"belfastlive.co.uk",
"cornwalllive.com"
]
}
]
},
"livechatinc.com": {
"rules": [
{
Expand Down Expand Up @@ -6482,6 +6544,17 @@
}
]
},
"primis.tech": {
"rules": [
{
"rule": "live.primis.tech/live/liveView.php",
"domains": [
"belfastlive.co.uk",
"cornwalllive.com"
]
}
]
},
"privacy-center.org": {
"rules": [
{
Expand Down Expand Up @@ -6611,7 +6684,8 @@
{
"rule": "protection-widget.route.com/protect.core.js",
"domains": [
"littleunicorn.com"
"littleunicorn.com",
"olfactif.com"
]
}
]
Expand Down Expand Up @@ -6708,6 +6782,16 @@
}
]
},
"route.com": {
"rules": [
{
"rule": "protection-widget.route.com/protect.core.js",
"domains": [
"littleunicorn.com"
]
}
]
},
"rumble.com": {
"rules": [
{
Expand Down Expand Up @@ -6810,6 +6894,16 @@
}
]
},
"slickstream.com": {
"rules": [
{
"rule": "app.slickstream.com",
"domains": [
"<all>"
]
}
]
},
"snapkit.com": {
"rules": [
{
Expand Down Expand Up @@ -6967,6 +7061,7 @@
{
"rule": "widget.trustpilot.com/bootstrap/v5/tp.widget.bootstrap.min.js",
"domains": [
"azurestandard.com",
"domesticandgeneral.com"
]
}
Expand Down Expand Up @@ -7284,7 +7379,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "f5e54d051c76c97e2ebaf3014037d10a"
"hash": "1ce506662b48fccc1bf37a3133fd3f1e"
},
"trackingCookies1p": {
"settings": {
Expand Down
Loading

0 comments on commit 9e7e64c

Please sign in to comment.