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

Sort servers by .serverId in repository

This commit is contained in:
Davide 2024-11-15 00:24:22 +01:00
parent 6472ac0502
commit 962ffdf678
No known key found for this signature in database
GPG Key ID: A48836171C759F5E
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -41,8 +41,7 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "git@github.com:passepartoutvpn/passepartoutkit-source", "location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
"state" : { "state" : {
"revision" : "3a4c78af67dfe181acc657a5539ee3d62d1c9361", "revision" : "d74cd0f02ba844beff2be55bf5f93796a3c43a6d"
"version" : "0.11.0"
} }
}, },
{ {

4
Passepartout/Library/Package.swift
View File

@ -43,8 +43,8 @@ let package = Package(
) )
], ],
dependencies: [ dependencies: [
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.11.0"), // .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.11.0"),
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "3a4c78af67dfe181acc657a5539ee3d62d1c9361"), .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "d74cd0f02ba844beff2be55bf5f93796a3c43a6d"),
// .package(path: "../../../passepartoutkit-source"), // .package(path: "../../../passepartoutkit-source"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"), .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"), // .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),

4
Passepartout/Library/Sources/AppDataProviders/Domain/VPNServerParameters+CoreData.swift
View File

@ -49,8 +49,8 @@ extension VPNSortField {
case .area: case .area:
return NSSortDescriptor(key: "area", ascending: true) return NSSortDescriptor(key: "area", ascending: true)
case .hostname: case .serverId:
return NSSortDescriptor(key: "hostname", ascending: true) return NSSortDescriptor(key: "serverId", ascending: true)
} }
} }
} }

2
Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift
View File

@ -50,7 +50,7 @@ struct VPNProviderServerView<Configuration>: View where Configuration: ProviderC
private var vpnManager = VPNProviderManager<Configuration>(sorting: [ private var vpnManager = VPNProviderManager<Configuration>(sorting: [
.localizedCountry, .localizedCountry,
.area, .area,
.hostname .serverId
]) ])
@StateObject @StateObject