Skip to content

Commit

Permalink
Merge branch 'fix-broken-custom-wireguard-port-selection-ios-951'
Browse files Browse the repository at this point in the history
  • Loading branch information
buggmagnet committed Nov 28, 2024
2 parents 512ba7c + 581ae27 commit b1b697f
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,12 @@ struct VPNSettingsViewModel: Equatable {
multihopState = tunnelSettings.tunnelMultihopState
}

/// Produce merged view model keeping entry `identifier` for matching DNS entries.
/// Produce merged view model, keeping entry `identifier` for matching DNS entries and
/// retaining available Wireguard port ranges.
func merged(_ other: VPNSettingsViewModel) -> VPNSettingsViewModel {
var mergedViewModel = other
mergedViewModel.customDNSDomains = merge(customDNSDomains, with: other.customDNSDomains)
mergedViewModel.availableWireGuardPortRanges = availableWireGuardPortRanges

return mergedViewModel
}
Expand Down

0 comments on commit b1b697f

Please sign in to comment.