Skip to content

Commit

Permalink
Udpate after merge conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
graeme committed Nov 14, 2023
1 parent a7de5f1 commit 4a94d09
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ extension NetworkProtectionKeychainTokenStore {

extension NetworkProtectionCodeRedemptionCoordinator {
convenience init() {
self.init(tokenStore: NetworkProtectionKeychainTokenStore(), errorEvents: .networkProtectionAppDebugEvents)
let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults)
self.init(environment: tunnelSettings.selectedEnvironment, tokenStore: NetworkProtectionKeychainTokenStore(), errorEvents: .networkProtectionAppDebugEvents)

Check failure on line 58 in DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift

View workflow job for this annotation

GitHub Actions / SwiftLint

Line should be 150 characters or less; currently it has 164 characters (line_length)
}
}

Expand All @@ -78,7 +79,11 @@ extension NetworkProtectionVPNSettingsViewModel {

extension NetworkProtectionVPNLocationViewModel {
convenience init() {
let locationListRepository = NetworkProtectionLocationListCompositeRepository(tokenStore: NetworkProtectionKeychainTokenStore())
let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults)
let locationListRepository = NetworkProtectionLocationListCompositeRepository(
environment: tunnelSettings.selectedEnvironment,
tokenStore: NetworkProtectionKeychainTokenStore()
)
self.init(
locationListRepository: locationListRepository,
tunnelSettings: TunnelSettings(defaults: .networkProtectionGroupDefaults)
Expand Down

0 comments on commit 4a94d09

Please sign in to comment.