Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

bitmask_android
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7e1d7e2b

You need to sign in or sign up before continuing.

Commit 7e1d7e2b authored 2 years ago by cyberta

Downloads
- Plain Diff

Merge branch 'DoH' into 'master'

DoH

See merge request !239

parents 821cac0b 3ce9d2a5

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

app/build.gradle 3 additions, 1 deletion

app/build.gradle
app/src/main/java/se/leap/bitmaskclient/base/BitmaskApp.java 5 additions, 0 deletions

app/src/main/java/se/leap/bitmaskclient/base/BitmaskApp.java
app/src/main/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java 1 addition, 1 deletion

...n/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java
app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/DnsResolver.java 97 additions, 18 deletions

...bitmaskclient/providersetup/connectivity/DnsResolver.java
app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/OkHttpClientGenerator.java 14 additions, 15 deletions

...ent/providersetup/connectivity/OkHttpClientGenerator.java
app/src/main/java/se/leap/bitmaskclient/providersetup/connectivity/TLSCompatSocketFactory.java 3 additions, 5 deletions

...nt/providersetup/connectivity/TLSCompatSocketFactory.java
app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java 5 additions, 3 deletions

...test/java/se/leap/bitmaskclient/testutils/MockHelper.java

with 128 additions and 43 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment