Skip to content

Commit

Permalink
Merge branch 'develop' into sam/vpn-waitlist
Browse files Browse the repository at this point in the history
* develop:
  Support environment setting (#2140)
  Update BSK (#2136)
  Update BSK for NetP change (#2134)
  Update test to match exact tracker (#2133)
  Avoid AppTP DB initialization when disabled (#2090)
  re-enable keyboard shortcuts (#2132)
  fix favorite launch with keyboard bug (#2131)
  Fix syncing empty favorites folders (#2121)
  kill variant when receiving atb update (#2130)
  Adding 'protectionsState' to breakage form submission (#2120)
  Release 7.96.0 (#2128)
  Update remote messaging production url (#2124)
  Alert user about abnormal app conditions (#2110)
  Add e2e test for email protection deep-links (#2123)
  Update to config v4 (#2114)
  • Loading branch information
samsymons committed Nov 10, 2023
2 parents 546882f + f4c0eba commit feef7bc
Show file tree
Hide file tree
Showing 148 changed files with 13,824 additions and 2,033 deletions.
24 changes: 24 additions & 0 deletions .maestro/release_tests/emailprotection.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
appId: com.duckduckgo.mobile.ios
tags:
- release

---

- clearState
- launchApp
- runFlow:
when:
visible:
text: "Let’s Do It!"
index: 0
file: ../shared/onboarding.yaml

- tapOn: Settings
- scroll
- scroll
- assertVisible: Email Protection
- tapOn: Email Protection, Block email trackers and hide your address
- assertVisible:
id: searchEntry
- assertVisible: https://duckduckgo.com/email/
- assertVisible: Email privacy, simplified.
2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 7.95.0
MARKETING_VERSION = 7.96.0
4 changes: 2 additions & 2 deletions Core/AppPrivacyConfigurationDataProvider.swift
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 = "\"a0d037f309e88ecd0b730418db6d73c5\""
public static let embeddedDataSHA = "9fc440e5eb590195150839759a56b34dd91cd5d11c84867526467362b7da08e7"
public static let embeddedDataETag = "\"39c652b21aa330463726faf240e03445\""
public static let embeddedDataSHA = "b19c28e816008ace47a9e3e58f74eef6558b5cbdcd7d79d098d7d2e56d686075"
}

public var embeddedDataEtag: String {
Expand Down
3 changes: 2 additions & 1 deletion Core/AppURLs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ public extension URL {

static let autocomplete = URL(string: "\(base)/ac/")!
static let emailProtection = URL(string: "\(base)/email")!
static let emailProtectionSignUp = URL(string: "\(base)/email/start-incontext")!
static let emailProtectionQuickLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/email"))!
static let aboutLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/about"))!

static let surrogates = URL(string: "\(staticBase)/surrogates.txt")!

// The following URLs shall match the ones in update_embedded.sh.
// Danger checks that the URLs match on every PR. If the code changes, the regex that Danger uses may need an update.
static let privacyConfig = URL(string: "\(staticBase)/trackerblocking/config/v3/ios-config.json")!
static let privacyConfig = URL(string: "\(staticBase)/trackerblocking/config/v4/ios-config.json")!
static let trackerDataSet = URL(string: "\(staticBase)/trackerblocking/v5/current/ios-tds.json")!
static let bloomFilter = URL(string: "\(staticBase)/https/https-mobile-v2-bloom.bin")!
static let bloomFilterSpec = URL(string: "\(staticBase)/https/https-mobile-v2-bloom-spec.json")!
Expand Down
8 changes: 7 additions & 1 deletion Core/ContentBlocking.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import BrowserServicesKit
import Combine
import Common


public final class ContentBlocking {
public static let shared = ContentBlocking()

Expand All @@ -34,6 +35,11 @@ public final class ContentBlocking {
private let exceptionsSource: DefaultContentBlockerRulesExceptionsSource
private let lastCompiledRulesStore: AppLastCompiledRulesStore

public var onCriticalError: (() -> Void)? {
didSet {
contentBlockingManager.onCriticalError = onCriticalError
}
}

private init(privacyConfigurationManager: PrivacyConfigurationManaging? = nil) {
let internalUserDecider = DefaultInternalUserDecider(store: InternalUserStore())
Expand Down Expand Up @@ -128,7 +134,7 @@ public final class ContentBlocking {
}

}

public func makeAdClickAttributionDetection(tld: TLD) -> AdClickAttributionDetection {
AdClickAttributionDetection(feature: adClickAttribution,
tld: tld,
Expand Down
1 change: 1 addition & 0 deletions Core/StatisticsLoader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public class StatisticsLoader {
public func storeUpdateVersionIfPresent(_ atb: Atb) {
if let updateVersion = atb.updateVersion {
statisticsStore.atb = updateVersion
statisticsStore.variant = nil
returnUserMeasurement.updateStoredATB(atb)
}
}
Expand Down
Loading

0 comments on commit feef7bc

Please sign in to comment.