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

Remove references to Google in UI #7557

Merged
merged 3 commits into from
Feb 10, 2025

Conversation

pinkisemils
Copy link
Collaborator

@pinkisemils pinkisemils commented Jan 30, 2025

I did a bad by updating the changelog and removing the Google resolvers from the mullvda-encrypted-dns-proxy. Now I'm cleaning it up and removing it from the UI too. I couldn't find any reference to Google in the android codebase, am I ooking in the right places @albin-mullvad ?


This change is Reviewable

Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r1, all commit messages.
Reviewable status: 1 of 2 files reviewed, all discussions resolved

@albin-mullvad
Copy link
Collaborator

@pinkisemils I believe you're looking for this line:

<string name="encrypted_dns_proxy_info_message_part2">If you are not connected to our VPN, then the Encrypted DNS proxy will use your own non-VPN IP when connecting. The DoH servers are hosted by one of the following providers: Quad 9, CloudFlare, or Google.</string>

Do you want me to push a commit? 🙂

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r1, 21 of 21 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @pinkisemils)


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r2 (raw file):

                        If you are not connected to our VPN, then the Encrypted DNS proxy will use your own non-VPN IP \
                        when connecting.
                        The DoH servers are hosted by one of the following providers: Quad9, Cloudflare.

nit: not consistent with the desktop/android string. Is that intentional? Otherwise we should probably align them 🙂

Quad9, Cloudflare vs. Quad9 or Cloudflare

Code quote:

Quad9, Cloudflare

Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 21 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @pinkisemils)

@pinkisemils pinkisemils force-pushed the remove-google-from-default-resolvers-ui branch from fbc6f41 to a8a41ad Compare February 7, 2025 13:30
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

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

Copy link
Collaborator Author

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


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r2 (raw file):

Previously, albin-mullvad wrote…

nit: not consistent with the desktop/android string. Is that intentional? Otherwise we should probably align them 🙂

Quad9, Cloudflare vs. Quad9 or Cloudflare

Should be consistent now :)

albin-mullvad
albin-mullvad previously approved these changes Feb 10, 2025
Copy link
Collaborator

@albin-mullvad albin-mullvad 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

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 22 of 23 files at r4, all commit messages.
Reviewable status: 22 of 23 files reviewed, 1 unresolved discussion


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r4 (raw file):

                        If you are not connected to our VPN, then the Encrypted DNS proxy will use your own non-VPN IP \
                        when connecting.
                        The DoH servers are hosted by one of the following providers: Quad9, Cloudflare.

Was this revert intentional? 🤔

Code quote:

Quad9, Cloudflare

Copy link
Collaborator

@albin-mullvad albin-mullvad 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: 22 of 23 files reviewed, 1 unresolved discussion (waiting on @pinkisemils)


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r4 (raw file):

Previously, albin-mullvad wrote…

Was this revert intentional? 🤔

I also just realized we write "Quad9" here but "Quad 9" with a space in other places

@pinkisemils pinkisemils force-pushed the remove-google-from-default-resolvers-ui branch from fbc6f41 to 33b0a52 Compare February 10, 2025 15:02
Copy link
Collaborator Author

@pinkisemils pinkisemils 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: 22 of 23 files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r4 (raw file):

Previously, albin-mullvad wrote…

I also just realized we write "Quad9" here but "Quad 9" with a space in other places

No, it was the result of a faulty rebase :( Should be fixed now - thank you for being diligent here :)

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 23 of 23 files at r5, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @pinkisemils)


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r4 (raw file):

Previously, pinkisemils (Emīls Piņķis) wrote…

No, it was the result of a faulty rebase :( Should be fixed now - thank you for being diligent here :)

Aha, I see! Great that you fixed it. Did you see my other comment regarding "Quad9" vs. "Quad 9"?

Copy link
Collaborator Author

@pinkisemils pinkisemils 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 @albin-mullvad)


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r4 (raw file):

Previously, albin-mullvad wrote…

Aha, I see! Great that you fixed it. Did you see my other comment regarding "Quad9" vs. "Quad 9"?

Saw yes, read no. I think the correct form is actually Quad9, as per their own website https://www.quad9.net/about/ .

Copy link
Collaborator

@albin-mullvad albin-mullvad 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 @pinkisemils)


ios/MullvadVPN/Coordinators/Settings/APIAccess/Models/AccessMethodViewModel.swift line 227 at r4 (raw file):

Previously, pinkisemils (Emīls Piņķis) wrote…

Saw yes, read no. I think the correct form is actually Quad9, as per their own website https://www.quad9.net/about/ .

Sounds good to use Quad9! 👍

@pinkisemils pinkisemils force-pushed the remove-google-from-default-resolvers-ui branch from 33b0a52 to d5bed21 Compare February 10, 2025 15:18
@pinkisemils pinkisemils force-pushed the remove-google-from-default-resolvers-ui branch from d5bed21 to 1f2e43c Compare February 10, 2025 15:26
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewed 3 of 3 files at r6.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

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

@pinkisemils pinkisemils merged commit 1560c1a into main Feb 10, 2025
34 checks passed
@pinkisemils pinkisemils deleted the remove-google-from-default-resolvers-ui branch February 10, 2025 15:44
Copy link

🚨 End to end tests failed. Please check the failed workflow run.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants