Skip to content

Commit

Permalink
Merge branch 'main' into sam/avoid-caching-privacy-config-in-feature-…
Browse files Browse the repository at this point in the history 
…flagger

# By Daniel Bernal (2) and others
# Via Federico Cappelli (1) and others
* main:
  Release 7.114.1-0 (#2700)
  Refresh token on Appear (#2699)
  Do not signout user on API failure (#2698)
  Release 7.115.0-0 (#2693)
  Password screen UI improvements: New open website & show password buttons (#2669)
  Removed VPN waitlist beta pixels (#2686)
  VPN: Cleanup authorize call (#2685)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
  • Loading branch information
@samsymons
samsymons committed Apr 8, 2024
2 parents 5ac3cc6 + dcbc78a commit 2bcc3d6
Show file tree
Hide file tree
Showing 21 changed files with 1,520 additions and 965 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.114.0
MARKETING_VERSION = 7.115.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 = "\"24f5176757f3bafd1ea7e457413fcff0\""
public static let embeddedDataSHA = "f318ef32f8069a458e8a4505eb8f53e3c25b60311d2daf763029c1e2606cea88"
public static let embeddedDataETag = "\"f5c95349fa08b7dd5a008deb15561c32\""
public static let embeddedDataSHA = "25ff4ebab0f843baa0878838c488cf2a7acfc8d83e58c7afb1aae13a78b5297f"
}

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 = "\"07bd7f610e3fa234856abcc2b56ab10e\""
public static let embeddedDataSHA = "1d7ef8f4c5a717a5d82f43383e33290021358d6255db12b6fdd0928e28d123ee"
public static let embeddedDataETag = "\"ef8ebcc98d8abccca793c7e04422b160\""
public static let embeddedDataSHA = "e2e8e5e191df54227222fbb0545a7eb8634b1156a69182323981bb6aed2c639d"
}

public var embeddedDataEtag: String {
Expand Down
18 changes: 0 additions & 18 deletions Core/PixelEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,6 @@ extension Pixel {

case networkProtectionUnhandledError

case networkProtectionWaitlistUserActive
case networkProtectionSettingsRowDisplayed
case networkProtectionWaitlistIntroScreenDisplayed
case networkProtectionWaitlistTermsDisplayed
case networkProtectionWaitlistTermsAccepted
case networkProtectionWaitlistNotificationShown
case networkProtectionWaitlistNotificationLaunched
case networkProtectionWaitlistRetriedInviteCodeRedemption

case networkProtectionGeoswitchingOpened
case networkProtectionGeoswitchingSetNearest
case networkProtectionGeoswitchingSetCustom
Expand Down Expand Up @@ -929,15 +920,6 @@ extension Pixel.Event {
case .networkProtectionMemoryCritical: return "m_netp_vpn_memory_critical"
case .networkProtectionUnhandledError: return "m_netp_unhandled_error"

case .networkProtectionWaitlistUserActive: return "m_netp_waitlist_user_active"
case .networkProtectionSettingsRowDisplayed: return "m_netp_waitlist_settings_entry_viewed"
case .networkProtectionWaitlistIntroScreenDisplayed: return "m_netp_waitlist_intro_screen_viewed"
case .networkProtectionWaitlistTermsDisplayed: return "m_netp_waitlist_terms_viewed"
case .networkProtectionWaitlistTermsAccepted: return "m_netp_waitlist_terms_accepted"
case .networkProtectionWaitlistNotificationShown: return "m_netp_waitlist_notification_shown"
case .networkProtectionWaitlistNotificationLaunched: return "m_netp_waitlist_notification_launched"
case .networkProtectionWaitlistRetriedInviteCodeRedemption: return "m_netp_waitlist_retried_invite_code_redemption"

case .networkProtectionGeoswitchingOpened: return "m_netp_imp_geoswitching"
case .networkProtectionGeoswitchingSetNearest: return "m_netp_ev_geoswitching_set_nearest"
case .networkProtectionGeoswitchingSetCustom: return "m_netp_ev_geoswitching_set_custom"
Expand Down
76 changes: 59 additions & 17 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": 1712088935529,
"version": 1712340816780,
"features": {
"adClickAttribution": {
"readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
Expand Down Expand Up @@ -1935,6 +1935,14 @@
{
"selector": ".proper-dynamic-insertion",
"type": "closest-empty"
},
{
"selector": ".Page-header-leaderboardAd",
"type": "hide-empty"
},
{
"selector": ".SovrnAd",
"type": "hide-empty"
}
]
},
Expand Down Expand Up @@ -2385,6 +2393,23 @@
}
]
},
{
"domain": "eurogamer.net",
"rules": [
{
"selector": "#sticky_leaderboard",
"type": "hide-empty"
},
{
"selector": ".primis_wrapper",
"type": "hide"
},
{
"selector": ".autoad",
"type": "hide-empty"
}
]
},
{
"domain": "examiner.com.au",
"rules": [
Expand Down Expand Up @@ -4242,7 +4267,7 @@
]
},
"state": "enabled",
"hash": "5094a939eec2d7e518ff15d628eec23f"
"hash": "0e089327b42a773f8e625bdc7bf27ddc"
},
"exceptionHandler": {
"exceptions": [
Expand Down Expand Up @@ -4900,14 +4925,14 @@
"rollout": {
"steps": [
{
"percent": 5
"percent": 10
}
]
}
}
},
"state": "enabled",
"hash": "f7cce63c16c142db4ff5764b542a6c52"
"hash": "b337f9c7cf15e7e4807ef232befaa999"
},
"privacyPro": {
"state": "enabled",
Expand Down Expand Up @@ -5024,6 +5049,11 @@
"state": "disabled",
"hash": "5e792dd491428702bc0104240fbce0ce"
},
"sslCertificates": {
"state": "disabled",
"exceptions": [],
"hash": "c292bb627849854515cebbded288ef5a"
},
"sync": {
"state": "enabled",
"features": {
Expand Down Expand Up @@ -5906,6 +5936,12 @@
"sbs.com.au"
]
},
{
"rule": "www3.doubleclick.net",
"domains": [
"scrolller.com"
]
},
{
"rule": "doubleclick.net",
"domains": [
Expand Down Expand Up @@ -6309,6 +6345,12 @@
"domains": [
"<all>"
]
},
{
"rule": "marketingplatform.google.com/about/enterprise",
"domains": [
"scrolller.com"
]
}
]
},
Expand All @@ -6317,18 +6359,7 @@
{
"rule": "imasdk.googleapis.com/js/sdkloader/ima3.js",
"domains": [
"arkadium.com",
"bloomberg.com",
"cbssports.com",
"gamak.tv",
"games.washingtonpost.com",
"metro.co.uk",
"nfl.com",
"pandora.com",
"paper-io.com",
"rawstory.com",
"usatoday.com",
"washingtonpost.com"
"<all>"
]
}
]
Expand All @@ -6353,6 +6384,7 @@
"daotranslate.com",
"drakescans.com",
"duden.de",
"edealinfo.com",
"freetubetv.net",
"hscprojects.com",
"kits4beats.com",
Expand Down Expand Up @@ -7657,6 +7689,16 @@
}
]
},
"sundaysky.com": {
"rules": [
{
"rule": "sundaysky.com",
"domains": [
"bankofamerica.com"
]
}
]
},
"taboola.com": {
"rules": [
{
Expand Down Expand Up @@ -8089,7 +8131,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "7aae19055144405351a27ca946fa674d"
"hash": "cddd2317b22c5433c401af3a7a35c062"
},
"trackingCookies1p": {
"settings": {
Expand Down
Loading

0 comments on commit 2bcc3d6

Please sign in to comment.