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

Adjust fixes for Android client: add a network conf, change how token is passed to gradle #8824

Merged
merged 3 commits into from
Dec 18, 2023

Conversation

strseb
Copy link
Collaborator

@strseb strseb commented Dec 15, 2023

This is part two of VPN-5822.

A write up of the issues this fixes is in the ticket: https://mozilla-hub.atlassian.net/browse/VPN-5822?focusedCommentId=809828

Description

Instead of a bool, let's enforce https for all known domains the client can talk to.

</trust-anchors>
</base-config>
<domain-config cleartextTrafficPermitted="false">
<domain includeSubdomains="true">mozilla.org</domain>
Copy link
Member

Choose a reason for hiding this comment

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

++ mozaws.net and allizom.org I think?

@@ -190,7 +183,7 @@ cd .tmp/src/android-build/
if [[ "$RELEASE" ]]; then
print Y "Generating Release APK..."
./gradlew compileReleaseSources
./gradlew assemble || die
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks @mcleinman thats waaay better!

@mcleinman mcleinman changed the title Add a network conf to the android client Adjust fixes for Android client: add a network conf, change how token is passed to gradle Dec 18, 2023
Copy link
Member

@lesleyjanenorton lesleyjanenorton left a comment

Choose a reason for hiding this comment

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

👍

@mcleinman mcleinman merged commit a444bb3 into main Dec 18, 2023
125 checks passed
@mcleinman mcleinman deleted the basti/netconf branch December 18, 2023 17:59
mcleinman added a commit that referenced this pull request Dec 18, 2023
… is passed to gradle (#8824)

* Add a network conf to the android client

* pass in variable

* per review

---------

Co-authored-by: Matt Cleinman <[email protected]>
mcleinman added a commit that referenced this pull request Dec 18, 2023
… is passed to gradle (#8824) (#8833)

* Add a network conf to the android client

* pass in variable

* per review

---------

Co-authored-by: Sebastian Streich <[email protected]>
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.

4 participants