Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app-apple/Sources/AppLibrary/Domain/EditableProfile.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public struct EditableProfile: MutableProfileType {

// some modules may require an active connection module (VPN)
// for example, IP and HTTP Proxy modules require a VPN in NE
if builder.activeConnectionModule == nil,
if !builder.hasConnection,
let requiringConnection = builder.activeModules.first(where: \.requiresConnection) {
throw ABI.AppError.moduleRequiresConnection(requiringConnection)
}
Expand All @@ -65,6 +65,16 @@ public struct EditableProfile: MutableProfileType {
}
}

private extension Profile.Builder {
var hasConnection: Bool {
if activeConnectionModule != nil { return true }
if let providerModule = firstModule(ofType: ProviderModule.self, ifActive: true) {
return providerModule.buildsConnection
}
return false
}
}

extension Profile {
public func editable() -> EditableProfile {
EditableProfile(
Expand Down
3 changes: 1 addition & 2 deletions app-apple/Sources/AppLibrary/L10n/AppError+L10n.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ extension ABI.AppError: @retroactive LocalizedError {
case .malformedModule(let module, let error):
return V.malformedModule(module.moduleType.localizedDescription, error.localizedDescription)
case .moduleRequiresConnection(let module):
let connectionTypes = ModuleType.allCases.filter(\.isConnection)
return V.moduleRequiresConnection(
module.moduleType.localizedDescription,
connectionTypes
ModuleType.connectionTypes
.map(\.localizedDescription)
.joined(separator: ", ")
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ extension ModuleType: @retroactive CaseIterable {
list.append(.Provider)
return list
}()

public static var connectionTypes: [ModuleType] {
ModuleType.allCases.filter(\.isConnection)
}
}

extension ModuleType {
Expand All @@ -29,3 +33,9 @@ extension ModuleType {
}
}
}

extension ProviderModule {
public var buildsConnection: Bool {
ModuleType.connectionTypes.contains(providerModuleType)
}
}
Loading