-
Notifications
You must be signed in to change notification settings - Fork 440
Introduce anti-censorship section in vpn settings #9465
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
Introduce anti-censorship section in vpn settings #9465
Conversation
Rawa
left a comment
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.
Only minor remarks. I've reviewed all Android code, very well done, looks very nice! @kl 👏
@Rawa reviewed 111 of 111 files at r1, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @kl)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AntiCensorshipSettingsViewModel.kt line 65 at r1 (raw file):
fun onSelectObfuscationMode(obfuscationMode: ObfuscationMode) { Logger.e("Select obfuscation mode $obfuscationMode")
Reminder to remove this log.
android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AntiCensorshipSettingsScreenTest.kt line 82 at r1 (raw file):
// Assert apply {
apply is not necessary, right?
android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt line 69 at r1 (raw file):
private val mockSettingsUpdate = MutableStateFlow<Settings?>(null) // private val portRangeFlow = MutableStateFlow(emptyList<PortRange>())
Reminder to remove these commented lines if not necessary
kl
left a comment
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: all files reviewed, 3 unresolved discussions (waiting on @Rawa)
android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AntiCensorshipSettingsScreenTest.kt line 82 at r1 (raw file):
Previously, Rawa (David Göransson) wrote…
applyis not necessary, right?
Done.
android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AntiCensorshipSettingsViewModel.kt line 65 at r1 (raw file):
Previously, Rawa (David Göransson) wrote…
Reminder to remove this log.
Done.
android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt line 69 at r1 (raw file):
Previously, Rawa (David Göransson) wrote…
Reminder to remove these commented lines if not necessary
Done.
Rawa
left a comment
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.
@Rawa reviewed 3 of 3 files at r2, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
Pururun
left a comment
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.
@Pururun reviewed all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @kl)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectPortViewModel.kt line 137 at r2 (raw file):
PortTypeUiState( presetPorts = SHADOWSOCKS_PRESET_PORTS, allowedPortRanges = shadowsocksPortRanges,
This needs to be all available ports otherwise users are blocked from setting a shadowsocks port that is valid for some servers. We should however show a text that shows which ports will work on all servers, but it can not be an invalid setting.
Pururun
left a comment
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: all files reviewed, 1 unresolved discussion (waiting on @kl)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectPortViewModel.kt line 137 at r2 (raw file):
Previously, Pururun (Jonatan Rhodin) wrote…
This needs to be all available ports otherwise users are blocked from setting a shadowsocks port that is valid for some servers. We should however show a text that shows which ports will work on all servers, but it can not be an invalid setting.
After internal discussion it was decided that we should just do as it currently is in the app and the use the hardcoded SHADOWSOCKS_AVAILABLE_PORTS instead of the ports we get from the relay list.
kl
left a comment
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: all files reviewed, 1 unresolved discussion (waiting on @Pururun)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectPortViewModel.kt line 137 at r2 (raw file):
Previously, Pururun (Jonatan Rhodin) wrote…
This needs to be all available ports otherwise users are blocked from setting a shadowsocks port that is valid for some servers. We should however show a text that shows which ports will work on all servers, but it can not be an invalid setting.
Done.
8f4976c to
99ff479
Compare
Rawa
left a comment
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.
@Rawa reviewed 89 of 89 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)
Pururun
left a comment
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.
@Pururun reviewed all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
53bf374 to
df7c617
Compare
Rawa
left a comment
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.
@Rawa reviewed 2 of 2 files at r4, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
Rawa
left a comment
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:
complete! all files reviewed, all discussions resolved
6df93e8 to
bb00412
Compare
df7c617 to
3bbbcbd
Compare
bb00412 to
2815b42
Compare
Rawa
left a comment
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.
@Rawa reviewed 12 of 96 files at r6.
Reviewable status: 46 of 134 files reviewed, all discussions resolved
Rawa
left a comment
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.
@Rawa reviewed 80 of 96 files at r6.
Reviewable status: 74 of 134 files reviewed, all discussions resolved
3bbbcbd to
ca507b6
Compare
Rawa
left a comment
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.
@Rawa reviewed 2 of 96 files at r6, 41 of 59 files at r7, 59 of 59 files at r8, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
Pururun
left a comment
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.
@Pururun reviewed all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
Serock3
left a comment
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.
@Serock3 reviewed 1 of 96 files at r6, 21 of 59 files at r8, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
This change is