-
Notifications
You must be signed in to change notification settings - Fork 425
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fcappelli/breakage_report_improvements
# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
- Loading branch information
Showing
56 changed files
with
3,027 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| MARKETING_VERSION = 7.98.0 | ||
| MARKETING_VERSION = 7.97.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // | ||
| // AppDelegate+Waitlists.swift | ||
| // DuckDuckGo | ||
| // | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Foundation | ||
| import BackgroundTasks | ||
| import NetworkProtection | ||
|
|
||
| extension AppDelegate { | ||
|
|
||
| func checkWaitlists() { | ||
| checkWindowsWaitlist() | ||
|
|
||
| #if NETWORK_PROTECTION | ||
| checkNetworkProtectionWaitlist() | ||
| #endif | ||
| checkWaitlistBackgroundTasks() | ||
|
|
||
| } | ||
|
|
||
| private func checkWindowsWaitlist() { | ||
| WindowsBrowserWaitlist.shared.fetchInviteCodeIfAvailable { error in | ||
| guard error == nil else { return } | ||
| WindowsBrowserWaitlist.shared.sendInviteCodeAvailableNotification() | ||
| } | ||
| } | ||
|
|
||
| #if NETWORK_PROTECTION | ||
| private func checkNetworkProtectionWaitlist() { | ||
| VPNWaitlist.shared.fetchInviteCodeIfAvailable { [weak self] error in | ||
| guard error == nil else { | ||
| #if !DEBUG | ||
| // If the user already has an invite code but their auth token has gone missing, attempt to redeem it again. | ||
| let tokenStore = NetworkProtectionKeychainTokenStore() | ||
| let waitlistStorage = VPNWaitlist.shared.waitlistStorage | ||
| if error == .alreadyHasInviteCode, | ||
| let inviteCode = waitlistStorage.getWaitlistInviteCode(), | ||
| !tokenStore.isFeatureActivated { | ||
| self?.fetchVPNWaitlistAuthToken(inviteCode: inviteCode) | ||
| } | ||
| #endif | ||
| return | ||
|
|
||
| } | ||
|
|
||
| guard let inviteCode = VPNWaitlist.shared.waitlistStorage.getWaitlistInviteCode() else { | ||
| return | ||
| } | ||
|
|
||
| self?.fetchVPNWaitlistAuthToken(inviteCode: inviteCode) | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| private func checkWaitlistBackgroundTasks() { | ||
| BGTaskScheduler.shared.getPendingTaskRequests { tasks in | ||
| let hasWindowsBrowserWaitlistTask = tasks.contains { $0.identifier == WindowsBrowserWaitlist.backgroundRefreshTaskIdentifier } | ||
| if !hasWindowsBrowserWaitlistTask { | ||
| WindowsBrowserWaitlist.shared.scheduleBackgroundRefreshTask() | ||
| } | ||
|
|
||
| #if NETWORK_PROTECTION | ||
| let hasVPNWaitlistTask = tasks.contains { $0.identifier == VPNWaitlist.backgroundRefreshTaskIdentifier } | ||
| if !hasVPNWaitlistTask { | ||
| VPNWaitlist.shared.scheduleBackgroundRefreshTask() | ||
| } | ||
| #endif | ||
| } | ||
| } | ||
|
|
||
| #if NETWORK_PROTECTION | ||
| func fetchVPNWaitlistAuthToken(inviteCode: String) { | ||
| Task { | ||
| do { | ||
| try await NetworkProtectionCodeRedemptionCoordinator().redeem(inviteCode) | ||
| VPNWaitlist.shared.sendInviteCodeAvailableNotification() | ||
| } catch {} | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+3.87 KB
DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/Card-16.imageset/Card-16.pdf
Binary file not shown.
15 changes: 15 additions & 0 deletions
15
DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/Card-16.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Card-16.pdf", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| }, | ||
| "properties" : { | ||
| "template-rendering-intent" : "template" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
DuckDuckGo/Assets.xcassets/Waitlist/VPN Waitlist/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Oops, something went wrong.