Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
f3e82b9e
Unverified
Commit
f3e82b9e
authored
May 30, 2020
by
vvb2060
Committed by
GitHub
May 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add DoH using cloudflare-dns
parent
e50295d3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
build.gradle
app/build.gradle
+2
-2
NetworkingModule.kt
...src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
+18
-0
No files found.
app/build.gradle
View file @
f3e82b9e
...
...
@@ -49,7 +49,6 @@ android {
exclude
'/org/bouncycastle/**'
exclude
'/kotlin/**'
exclude
'/kotlinx/**'
exclude
'/okhttp3/**'
}
kotlinOptions
{
...
...
@@ -103,11 +102,12 @@ dependencies {
implementation
"com.squareup.retrofit2:converter-scalars:${vRetrofit}"
implementation
"com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
def
vOkHttp
=
'3.12.1
0
'
def
vOkHttp
=
'3.12.1
2
'
implementation
(
"com.squareup.okhttp3:okhttp:${vOkHttp}"
)
{
force
=
true
}
implementation
"com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
implementation
(
"com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}"
)
def
vMoshi
=
'1.10.0-SNAPSHOT'
implementation
"com.squareup.moshi:moshi:${vMoshi}"
...
...
app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
View file @
f3e82b9e
...
...
@@ -12,13 +12,16 @@ import io.noties.markwon.Markwon
import
io.noties.markwon.html.HtmlPlugin
import
io.noties.markwon.image.ImagesPlugin
import
io.noties.markwon.image.network.OkHttpNetworkSchemeHandler
import
okhttp3.HttpUrl
import
okhttp3.OkHttpClient
import
okhttp3.dnsoverhttps.DnsOverHttps
import
okhttp3.logging.HttpLoggingInterceptor
import
org.koin.dsl.module
import
retrofit2.Retrofit
import
retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import
retrofit2.converter.moshi.MoshiConverterFactory
import
retrofit2.converter.scalars.ScalarsConverterFactory
import
java.net.InetAddress
val
networkingModule
=
module
{
single
{
createOkHttpClient
(
get
())
}
...
...
@@ -43,6 +46,21 @@ fun createOkHttpClient(context: Context): OkHttpClient {
builder
.
sslSocketFactory
(
NoSSLv3SocketFactory
())
}
builder
.
dns
(
DnsOverHttps
.
Builder
().
client
(
builder
.
build
())
.
url
(
HttpUrl
.
get
(
"https://cloudflare-dns.com/dns-query"
))
.
bootstrapDnsHosts
(
listOf
(
InetAddress
.
getByName
(
"162.159.36.1"
),
InetAddress
.
getByName
(
"162.159.46.1"
),
InetAddress
.
getByName
(
"1.1.1.1"
),
InetAddress
.
getByName
(
"1.0.0.1"
),
InetAddress
.
getByName
(
"162.159.132.53"
),
InetAddress
.
getByName
(
"2606:4700:4700::1111"
),
InetAddress
.
getByName
(
"2606:4700:4700::1001"
),
InetAddress
.
getByName
(
"2606:4700:4700::0064"
),
InetAddress
.
getByName
(
"2606:4700:4700::6400"
)
))
.
build
())
return
builder
.
build
()
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment