Skip to content

Conversation

@kl
Copy link
Contributor

@kl kl commented Dec 3, 2025


This change is Reviewable

@kl kl added the Android Issues related to Android label Dec 3, 2025
@linear
Copy link

linear bot commented Dec 3, 2025

Copy link
Collaborator

@Rawa Rawa left a 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, :lgtm: 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

Copy link
Contributor Author

@kl kl left a 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…

apply is 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
Rawa previously approved these changes Dec 4, 2025
Copy link
Collaborator

@Rawa Rawa left a 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: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@Pururun Pururun left a 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.

Copy link
Contributor

@Pururun Pururun left a 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.

Copy link
Contributor Author

@kl kl left a 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.

@kl kl force-pushed the introduce-anti-censorship-section-in-vpn-settings-droid-2314 branch from 8f4976c to 99ff479 Compare December 4, 2025 15:20
@kl kl changed the base branch from main to remove-openvpn-part5 December 4, 2025 15:21
Copy link
Collaborator

@Rawa Rawa left a 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)

Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

@Pururun reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@kl kl force-pushed the introduce-anti-censorship-section-in-vpn-settings-droid-2314 branch 2 times, most recently from 53bf374 to df7c617 Compare December 4, 2025 15:48
Copy link
Collaborator

@Rawa Rawa left a 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: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Collaborator

@Rawa Rawa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@kl kl force-pushed the introduce-anti-censorship-section-in-vpn-settings-droid-2314 branch from df7c617 to 3bbbcbd Compare December 5, 2025 14:14
Copy link
Collaborator

@Rawa Rawa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

@Rawa reviewed 12 of 96 files at r6.
Reviewable status: 46 of 134 files reviewed, all discussions resolved

Copy link
Collaborator

@Rawa Rawa left a 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

@kl kl force-pushed the introduce-anti-censorship-section-in-vpn-settings-droid-2314 branch from 3bbbcbd to ca507b6 Compare December 5, 2025 14:47
Copy link
Collaborator

@Rawa Rawa left a 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: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

@Pururun reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@MarkusPettersson98 MarkusPettersson98 merged commit ca507b6 into remove-openvpn-part5 Dec 8, 2025
35 checks passed
@MarkusPettersson98 MarkusPettersson98 deleted the introduce-anti-censorship-section-in-vpn-settings-droid-2314 branch December 8, 2025 10:55
Copy link
Contributor

@Serock3 Serock3 left a 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: :shipit: complete! all files reviewed, all discussions resolved

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Android Issues related to Android

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants