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

Implement support for daita with multihop #7230

Merged
merged 5 commits into from
Dec 2, 2024

Conversation

Pururun
Copy link
Contributor

@Pururun Pururun commented Nov 25, 2024


This change is Reviewable

Copy link

linear bot commented Nov 25, 2024

@Pururun Pururun changed the title Implement support for daita with multihop droid Implement support for daita with multihop Nov 25, 2024
@Pururun Pururun added the Android Issues related to Android label Nov 25, 2024
@Pururun Pururun force-pushed the implement-support-for-daita-with-multihop-droid-1412 branch 3 times, most recently from 0e5b01b to 46879ea Compare November 26, 2024 09:08
Copy link
Contributor

@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.

Reviewed 30 of 93 files at r1, 36 of 59 files at r2, 1 of 61 files at r4.
Reviewable status: 30 of 111 files reviewed, 2 unresolved discussions (waiting on @Pururun)


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

            .mapEmpty()

    suspend fun setDaitaEnabled(enabled: Boolean): Either<SetDaitaSettingsError, Unit> =

Should we use this message instead?
rpc SetEnableDaita(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}


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

            .mapEmpty()

    suspend fun setDaitaDirectOnly(enabled: Boolean): Either<SetDaitaSettingsError, Unit> =

Should we use this message instead?
rpc SetDaitaDirectOnly(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}

@Rawa Rawa changed the base branch from main to implement-multihop-ui-droid-822 November 26, 2024 12:08
@Pururun Pururun force-pushed the implement-multihop-ui-droid-822 branch 2 times, most recently from e4c6847 to ffde559 Compare November 27, 2024 07:51
Base automatically changed from implement-multihop-ui-droid-822 to main November 27, 2024 07:58
@Pururun Pururun force-pushed the implement-support-for-daita-with-multihop-droid-1412 branch from 46879ea to b5ae47b Compare November 27, 2024 08:10
@Pururun Pururun marked this pull request as ready for review November 27, 2024 08:10
Copy link
Contributor Author

@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: 0 of 111 files reviewed, 2 unresolved discussions (waiting on @Rawa)


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

Previously, Rawa (David Göransson) wrote…

Should we use this message instead?
rpc SetEnableDaita(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}

Done.


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

Previously, Rawa (David Göransson) wrote…

Should we use this message instead?
rpc SetDaitaDirectOnly(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}

Done.

DaitaScreen(
state = state,
onDaitaEnabled = viewModel::setDaita,
onDirectOnly = { enable ->
Copy link
Contributor

Choose a reason for hiding this comment

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

onDirectOnlyClick?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@@ -33,7 +34,7 @@ class FilterCustomListsRelayItemUseCase(
providers = selectedProviders,
daita =
shouldFilterByDaita(
isDaitaEnabled = settings?.isDaitaEnabled() == true,
isDaitaEnabled = settings?.daitaAndDirectOnly() == true,
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this be more explicit? isDaitaEnabled is seemingly from this logic specifically isDirectOnlyDaitaEnabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed

@Pururun Pururun force-pushed the implement-support-for-daita-with-multihop-droid-1412 branch from b5ae47b to 477c4ea Compare November 27, 2024 12:57
Rawa
Rawa previously approved these changes Nov 27, 2024
Copy link
Contributor

@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.

Reviewed 31 of 61 files at r4, 44 of 56 files at r5, 28 of 31 files at r6, 9 of 9 files at r7, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@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:

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

@Pururun Pururun force-pushed the implement-support-for-daita-with-multihop-droid-1412 branch from f8c699a to d09006e Compare December 2, 2024 09:49
@Pururun Pururun force-pushed the implement-support-for-daita-with-multihop-droid-1412 branch from d09006e to 124bf64 Compare December 2, 2024 10:05
@Pururun Pururun merged commit 2e022ba into main Dec 2, 2024
33 of 34 checks passed
@Pururun Pururun deleted the implement-support-for-daita-with-multihop-droid-1412 branch December 2, 2024 10:07
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