diff --git a/Passepartout/App/Managers/IntentsManager.swift b/Passepartout/App/Managers/IntentsManager.swift index 59eab287..478d6239 100644 --- a/Passepartout/App/Managers/IntentsManager.swift +++ b/Passepartout/App/Managers/IntentsManager.swift @@ -50,7 +50,7 @@ final class IntentsManager: NSObject, ObservableObject { isReloadingShortcuts = true do { let vs = try await INVoiceShortcutCenter.shared.allVoiceShortcuts() - shortcuts = vs.reduce(into: [UUID: Shortcut]()) { + shortcuts = vs.reduce(into: [:]) { $0[$1.identifier] = Shortcut($1) } isReloadingShortcuts = false diff --git a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/OnDemand+Rules.swift b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/OnDemand+Rules.swift index f816cecf..a1467d32 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/OnDemand+Rules.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/OnDemand+Rules.swift @@ -58,11 +58,9 @@ private extension Profile.OnDemand { // apply exceptions (unless .any) if withCustomRules && policy != .any { -#if os(iOS) if Utils.hasCellularData() && withMobileNetwork { rules.append(cellularRule()) } -#endif if Utils.hasEthernet() && withEthernetNetwork { if let rule = ethernetRule() { rules.append(rule) diff --git a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/PassepartoutVPN+StrippableContent.swift b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/PassepartoutVPN+StrippableContent.swift index da3cce9c..500350f5 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/PassepartoutVPN+StrippableContent.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Extensions/PassepartoutVPN+StrippableContent.swift @@ -39,7 +39,7 @@ extension Profile.Account: StrippableContent { extension Profile.OnDemand: StrippableContent { public var stripped: Self { var copy = self - copy.withSSIDs = copy.withSSIDs.reduce(into: [String: Bool]()) { + copy.withSSIDs = copy.withSSIDs.reduce(into: [:]) { guard let strippedKey = $1.key.strippedNotEmpty else { return } diff --git a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift index 8d524a62..cdb3eaf0 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPNImpl/Strategies/CDProfileRepository.swift @@ -111,7 +111,7 @@ private extension CDProfileRepository { context: context, request: request, mapping: { - $0.reduce(into: [UUID: Profile]()) { + $0.reduce(into: [:]) { guard let dto = $1 as? CDProfile else { return }