passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve logic of setting duplicate as current 

Back currentProfileId with an internal variable that allows for
more control over navigation.

Can drop pendingProfiles hack.
This commit is contained in:
Davide De Rosa 2022-05-04 09:41:10 +02:00
parent b68fb21652
commit 7ec6ccda6c
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
PassepartoutCore/Sources/PassepartoutProfiles/Managers/ProfileManager.swift
View File

@ -55,15 +55,25 @@ public class ProfileManager: ObservableObject {
}
}
@Published public var currentProfileId: UUID? {
@Published private var internalCurrentProfileId: UUID? {
willSet {
pp_log.debug("Setting current profile: \(newValue?.uuidString ?? "nil")")
}
}
public var currentProfileId: UUID? {
get {
internalCurrentProfileId
}
set {
guard let id = newValue else {
internalCurrentProfileId = nil
return
}
guard let profile = liveProfile(withId: id) else {
return
}
internalCurrentProfileId = id
setCurrentProfile(profile)
}
}
@ -72,8 +82,6 @@ public class ProfileManager: ObservableObject {
public let didCreateProfile = PassthroughSubject<Profile, Never>()
private var pendingProfiles: [UUID: Profile] = [:]
private var cancellables: Set<AnyCancellable> = []
public init(
@ -177,10 +185,6 @@ extension ProfileManager {
pp_log.debug("Profile \(currentProfile.value.logDescription) found in memory (current profile)")
return currentProfile.value
}
if let pending = pendingProfiles[id] {
pp_log.debug("Profile \(pending.logDescription) found in memory (pending profile)")
return pending
}
guard let profile = strategy.profile(withId: id) else {
assertionFailure("Profile in headers yet not found in persistent store")
@ -253,23 +257,15 @@ extension ProfileManager {
.withNewId()
.renamedUniquely(withLastUpdate: false)
//
// XXX: we want to batch save the duplicate together with the former current
// profile, which is done in setCurrentProfile(). however, setting
// currentProfileId (for navigation), requires the profile ID to exist in
// the persistent store when looked up via liveProfile(withId:)
//
// the pendingProfiles workaround allows setting currentProfileId to a
// profile that has not been persisted yet
//
if setAsCurrent {
pendingProfiles[copy.id] = copy
// iOS 14 goes crazy when changing binding of a presented NavigationLink
if #available(iOS 15, *) {
currentProfileId = copy.id
} else {
setCurrentProfile(copy)
internalCurrentProfileId = copy.id
}
pendingProfiles.removeValue(forKey: copy.id)
// autosaves copy if non-existing in persistent store
setCurrentProfile(copy)
} else {
strategy.saveProfile(copy)
}
@ -303,15 +299,15 @@ extension ProfileManager {
// means that carelessly calling .saveProfiles() may trigger an unnecessary
// willUpdateProfiles() and a potential animation in subscribers (e.g. OrganizerView)
//
// current profile, when set on launch, is never fetched from pendingProfiles, so we take
// care of checking that to avoid an undesired save
// current profile, when set on launch, is always existing, so we take care
// checking that to avoid an undesired save
//
var profilesToSave: [Profile] = []
if isExistingProfile(withId: currentProfile.value.id) {
pp_log.info("Defer saving of former current profile \(currentProfile.value.logDescription)")
profilesToSave.append(currentProfile.value)
}
if let _ = pendingProfiles[profile.id] {
if !isExistingProfile(withId: profile.id) {
pp_log.info("Defer saving of transient current profile \(profile.logDescription)")
profilesToSave.append(profile)
}