From d0cd953031950b3f15f532ad9772927c2ba17dc8 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sun, 14 Jan 2024 14:20:39 +0100 Subject: [PATCH] Drop deprecated .disconnectsIfNotMatching (#472) Unused since trusted networks was converted to on-demand. --- .../Sources/PassepartoutVPN/Domain/Profile+OnDemand.swift | 3 --- .../Strategies/CDProfileRepository.swift | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/PassepartoutLibrary/Sources/PassepartoutVPN/Domain/Profile+OnDemand.swift b/PassepartoutLibrary/Sources/PassepartoutVPN/Domain/Profile+OnDemand.swift index 32cfcb7f..38c45e8d 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPN/Domain/Profile+OnDemand.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPN/Domain/Profile+OnDemand.swift @@ -49,9 +49,6 @@ extension Profile { public var withOtherNetworks: Set = [] - @available(*, deprecated, message: "Drop field after releasing as optional to the App Store") - public var disconnectsIfNotMatching: Bool? = true - public init() { } } diff --git a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift index 17414ab2..20838d04 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift @@ -61,12 +61,7 @@ final class CDProfileRepository: ProfileRepository { existing.forEach(context.delete) try profiles.forEach { - - // FIXME: on demand, workaround to retain profiles on downgrade (field is required before 2.2.0) - var copy = $0 - copy.onDemand.disconnectsIfNotMatching = true - - _ = try ProfileMapper(context).toDTO(copy) + _ = try ProfileMapper(context).toDTO($0) } try context.save() } catch {