-
Notifications
You must be signed in to change notification settings - Fork 336
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adjust relay selector to support custom lists #5788
Adjust relay selector to support custom lists #5788
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 0 of 2 files reviewed, 2 unresolved discussions (waiting on @rablador)
ios/MullvadTypes/RelayConstraints.swift
line 31 at r1 (raw file):
self.customListId = customListId } }
Code snippet:
public struct RelayLocationList: Codable, Equatable {
public let id: UUID?
public let locations: [RelayLocation]
public init(customListId: UUID? = nil ,locations: [RelayLocation]) {
self.locations = locations
self.id = customListId
}
}
ios/MullvadTypes/RelayConstraints.swift
line 46 at r1 (raw file):
public init( locations: RelayConstraint<RelayLocationPersistent> = .only(RelayLocationPersistent(locations: [.country("se")], customListId: nil)),
removing nit from constructor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed all commit messages.
Reviewable status: 0 of 2 files reviewed, 2 unresolved discussions (waiting on @rablador)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 0 of 2 files reviewed, 2 unresolved discussions (waiting on @mojganii)
ios/MullvadTypes/RelayConstraints.swift
line 31 at r1 (raw file):
self.customListId = customListId } }
I renamed it RelayLocations
and added the default param.
ios/MullvadTypes/RelayConstraints.swift
line 46 at r1 (raw file):
Previously, mojganii wrote…
removing nit from constructor
Done.
5aac813
to
7aa591b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 2 files at r1, 3 of 3 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @mojganii)
9f40be3
to
c2ebb91
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 6 of 6 files at r3, all commit messages.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @mojganii and @rablador)
ios/MullvadVPN.xcodeproj/project.pbxproj
line 3305 at r3 (raw file):
sourceTree = "<group>"; }; 7A038FDD2B7A56CF00950251 /* Recovered References */ = {
This looks like it shouldn't be here, can you make sure to delete this folder ?
ios/MullvadVPNTests/StartTunnelOperationTests.swift
line 92 at r3 (raw file):
dispatchQueue: testQueue, interactor: interactor ) { result in
Those are already fixed on main
c2ebb91
to
7a557a8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 7 of 9 files reviewed, 4 unresolved discussions (waiting on @buggmagnet and @mojganii)
ios/MullvadVPN.xcodeproj/project.pbxproj
line 3305 at r3 (raw file):
Previously, buggmagnet wrote…
This looks like it shouldn't be here, can you make sure to delete this folder ?
Done.
ios/MullvadVPNTests/StartTunnelOperationTests.swift
line 92 at r3 (raw file):
Previously, buggmagnet wrote…
Those are already fixed on main
Done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 2 files at r4, all commit messages.
Reviewable status: 8 of 9 files reviewed, 4 unresolved discussions (waiting on @buggmagnet and @mojganii)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 2 of 2 files at r4, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @mojganii)
f293e40
to
6ac920d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 3 of 3 files at r5, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @mojganii)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 3 of 3 files at r5, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @mojganii)
6ac920d
to
c39298e
Compare
When a custom list enabled, the relay selector should match relays by location using the custom list - if a relay matches any of the location constraints in a custom list, it should be added to the list of eligible relays to be picked by the roulette selection.
This change is