Skip to content
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

Add setting for udp2tcp port #6310

Merged
merged 4 commits into from
Jun 4, 2024
Merged

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Jun 3, 2024


This change is Reviewable

Copy link

linear bot commented Jun 3, 2024

@Rawa Rawa requested a review from Pururun June 3, 2024 12:41
@Rawa Rawa self-assigned this Jun 3, 2024
@Rawa Rawa added the Android Issues related to Android label Jun 3, 2024
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.

Reviewed 34 of 34 files at r1, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @Rawa)


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 212 at r1 (raw file):

    @Test
    fun testShowTcpOverUdpPortOptions() =

Maybe we should have some tests so that you can not set the port when udp over tcp is not available?


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 456 at r1 (raw file):

            // Assert
            verify(exactly = 1) { mockedNavigateToObfuscationInfo() }

Just a side not, but could be nice with a verifyExactlyOnce function, or maybe that is too verbose?


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt line 594 at r1 (raw file):

            itemWithDivider {
                ExpandableComposeCell(

Should show disabled somehow and should not be able to change port if udp over tcp is disabled

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, 4 unresolved discussions (waiting on @Rawa)


android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt line 389 at r1 (raw file):

            .mapEmpty()

    suspend fun setObfuscationPort(

This function looks quite complicated, can we not wrap the whole this in an either catch?

Copy link
Contributor Author

@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: 28 of 36 files reviewed, 3 unresolved discussions (waiting on @Pururun)


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 212 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Maybe we should have some tests so that you can not set the port when udp over tcp is not available?

Added a test for this.


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 456 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Just a side not, but could be nice with a verifyExactlyOnce function, or maybe that is too verbose?

Too verbose I think, lets just use the simple standard way.


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt line 594 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Should show disabled somehow and should not be able to change port if udp over tcp is disabled

Yes it totally should! Fixed!


android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt line 389 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

This function looks quite complicated, can we not wrap the whole this in an either catch?

Fixed!

@Rawa Rawa requested a review from Pururun June 3, 2024 14:26
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:

Reviewed 8 of 8 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa Rawa force-pushed the add-setting-for-udp2tcp-port-droid-249 branch from 17ea81b to 571c620 Compare June 4, 2024 06:27
@Rawa Rawa merged commit 45c369f into main Jun 4, 2024
24 of 25 checks passed
@Rawa Rawa deleted the add-setting-for-udp2tcp-port-droid-249 branch June 4, 2024 06:27
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.

2 participants