-
Notifications
You must be signed in to change notification settings - Fork 35
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Shared code for VPN onboarding tips #1024
Draft
diegoreymendez
wants to merge
4
commits into
main
Choose a base branch
from
diego/add-vpn-tips
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// The Swift Programming Language | ||
// https://docs.swift.org/swift-book | ||
|
||
import Combine | ||
import Foundation | ||
|
||
public final class CurrentValuePublisher<Output, Failure: Error> { | ||
|
||
private(set) public var value: Output | ||
private let wrappedPublisher: AnyPublisher<Output, Failure> | ||
private var cancellable: AnyCancellable? | ||
|
||
public init(initialValue: Output, publisher: AnyPublisher<Output, Failure>) { | ||
value = initialValue | ||
wrappedPublisher = publisher | ||
|
||
subscribeToPublisherUpdates() | ||
} | ||
|
||
private func subscribeToPublisherUpdates() { | ||
cancellable = wrappedPublisher | ||
.receive(on: DispatchQueue.main) | ||
.sink(receiveCompletion: { _ in }) { [weak self] value in | ||
self?.value = value | ||
} | ||
} | ||
} | ||
|
||
extension CurrentValuePublisher: Publisher { | ||
public func receive<S>(subscriber: S) where S : Subscriber, Failure == S.Failure, Output == S.Input { | ||
|
||
wrappedPublisher.receive(subscriber: subscriber) | ||
} | ||
|
||
|
||
} |
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,94 @@ | ||
// | ||
// TipKitController.swift | ||
// | ||
// Copyright © 2024 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 os.log | ||
import TipKit | ||
|
||
public protocol TipKitControlling { | ||
@available(iOS 17.0, *) | ||
func configureTipKit() | ||
|
||
@available(iOS 17.0, *) | ||
func resetTipKitOnNextAppLaunch() | ||
} | ||
|
||
typealias TipKitAppEventHandler = TipKitController | ||
|
||
public final class TipKitController { | ||
|
||
private let logger: Logger | ||
private let userDefaults: UserDefaults | ||
|
||
private var resetTipKitOnNextLaunch: Bool { | ||
get { | ||
userDefaults.bool(forKey: "resetTipKitOnNextLaunch") | ||
} | ||
|
||
set { | ||
userDefaults.set(newValue, forKey: "resetTipKitOnNextLaunch") | ||
} | ||
} | ||
|
||
public init(logger: Logger, | ||
userDefaults: UserDefaults) { | ||
|
||
self.logger = logger | ||
self.userDefaults = userDefaults | ||
} | ||
|
||
@available(iOS 17.0, macOS 14.0, *) | ||
public func configureTipKit(_ configuration: [Tips.ConfigurationOption] = []) { | ||
do { | ||
if resetTipKitOnNextLaunch { | ||
resetTipKit() | ||
resetTipKitOnNextLaunch = false | ||
} | ||
|
||
try Tips.configure(configuration) | ||
|
||
logger.debug("TipKit initialized") | ||
} catch { | ||
logger.error("Failed to initialize TipKit: \(error)") | ||
} | ||
} | ||
|
||
@available(iOS 17.0, macOS 14.0, *) | ||
private func resetTipKit() { | ||
do { | ||
try Tips.resetDatastore() | ||
|
||
logger.debug("TipKit reset") | ||
} catch { | ||
logger.debug("Failed to reset TipKit: \(error)") | ||
} | ||
} | ||
|
||
/// Resets TipKit | ||
/// | ||
/// One thing that's not documented as of 2024-10-09 is that resetting TipKit must happen before it's configured. | ||
/// When trying to reset it after it's configured we get `TipKit.TipKitError(value: TipKit.TipKitError.Value.tipsDatastoreAlreadyConfigured)`. | ||
/// In order to make things work for us we set a user defaults value that ensures TipKit will be reset on next | ||
/// app launch instead of directly trying to reset it here. | ||
/// | ||
@available(iOS 17.0, *) | ||
public func resetTipKitOnNextAppLaunch() { | ||
resetTipKitOnNextLaunch = true | ||
logger.debug("TipKit will reset on next app launch") | ||
} | ||
Comment on lines
+89
to
+93
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it intended that this is only checking for an iOS version? (I think so, but just double checking) |
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will need to be swapped to use the project-wide header comment