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

Separate Constants For VPN, TOR and MAIN_APP #240

Merged
merged 1 commit into from Jul 8, 2019

Conversation

@sisbell
Copy link
Contributor

sisbell commented Jul 1, 2019

Took Orbot constants and broke it apart based upon module usage. This will help with encapsulation and provided some additional cohesion for the VPN and the Tor Service modules.

Specifically, I introduced VpnConstants and VpnPrefs to contain Vpn specific information. The app also has a MainConstants, containing constants it needs.

I moved some methods from TorServiceUtils to VpnUtils to help with layering. The sharedPrefs method is duplicated but this assists with the separation for now.

The other thing to note is that the dnsPort is now set as a pref, rather than directly as a field on TorService. This removes a direct dependency.

Note this merge also includes #237 (Unfortunately I need this to build in my environment)

@sisbell sisbell force-pushed the sisbell:sisbell_236a branch from f3211ac to 1c38695 Jul 8, 2019
@sisbell

This comment has been minimized.

Copy link
Contributor Author

sisbell commented Jul 8, 2019

I fixed merge conflicts with most recent master.

@n8fr8 n8fr8 merged commit 1c38695 into guardianproject:master Jul 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.