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 info dialog to Encrypted DNS proxy access method #7087

Merged
merged 2 commits into from
Oct 29, 2024

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Oct 28, 2024


This change is Reviewable

@Rawa Rawa added the Android Issues related to Android label Oct 28, 2024
@Rawa Rawa self-assigned this Oct 28, 2024
Copy link

linear bot commented Oct 28, 2024

@Rawa Rawa force-pushed the add-info-dialog-droid-1487 branch from d87793d to d0ce635 Compare October 29, 2024 07: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.

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


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/EncryptedDnsProxyInfoDialog.kt line 24 at r1 (raw file):

fun EncryptedDnsProxyInfo(navigator: DestinationsNavigator) {
    InfoDialog(
        message =

Info dialogs needs some cleanup, but I think you can achieve the same effect by just setting message and additionalInfo and then you don't need appendLine


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

                is ApiAccessMethod.CustomProxy.Socks5Remote -> null
                ApiAccessMethod.Direct -> null
                ApiAccessMethod.EncryptedDns -> onNavigateToEncryptedDnsInfoDialog

Should be able to collapse all the null cases to one

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: all files reviewed, 2 unresolved discussions (waiting on @Pururun)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/EncryptedDnsProxyInfoDialog.kt line 24 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Info dialogs needs some cleanup, but I think you can achieve the same effect by just setting message and additionalInfo and then you don't need appendLine

Discussed offline.


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

Previously, Pururun (Jonatan Rhodin) wrote…

Should be able to collapse all the null cases to one

Done.

Pururun
Pururun previously approved these changes Oct 29, 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.

:lgtm:

Reviewed 1 of 1 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.

:lgtm:

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

@Rawa Rawa force-pushed the add-info-dialog-droid-1487 branch from 92ee60f to ca9f109 Compare October 29, 2024 12:04
@Rawa Rawa merged commit 4be425e into main Oct 29, 2024
29 checks passed
@Rawa Rawa deleted the add-info-dialog-droid-1487 branch October 29, 2024 12:09
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