Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Faisal Alanzi
Nebulo
Commits
88f01cda
Commit
88f01cda
authored
Jun 03, 2021
by
Daniel Wolf
Browse files
Use canary domain to avoid firefox using it's own DoH
Implements #285
parent
824bc87a
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
88f01cda
...
...
@@ -148,7 +148,7 @@ dependencies {
implementation
'com.frostnerd.utilskt:lifecycle:1.2.2'
implementation
'com.frostnerd.utilskt:preferences:1.5.31'
// https://git.frostnerd.com/AndroidUtils/preferenceskt
implementation
'com.frostnerd.utilskt:navigationdraweractivity:1.4.3'
// https://git.frostnerd.com/AndroidUtils/navigationdraweractivity
implementation
'com.frostnerd.utilskt:encrypteddnstunnelproxy:2.1.
29
'
// https://git.frostnerd.com/AndroidUtils/encrypteddnstunnelproxy
implementation
'com.frostnerd.utilskt:encrypteddnstunnelproxy:2.1.
30
'
// https://git.frostnerd.com/AndroidUtils/encrypteddnstunnelproxy
implementation
'com.frostnerd.utilskt:general:1.0.26'
// https://git.frostnerd.com/AndroidUtils/generalkt
implementation
'com.frostnerd.utilskt:adapters:1.3.5'
// https://git.frostnerd.com/AndroidUtils/Adapters
...
...
app/src/main/java/com/frostnerd/smokescreen/util/proxy/DnsRuleResolver.kt
View file @
88f01cda
...
...
@@ -42,6 +42,10 @@ class DnsRuleResolver(context: Context) : LocalResolver(false) {
private
var
cachedWildcardResolved
=
MaxSizeMap
<
Int
,
String
>(
maxWildcardResolvedCacheSize
,
30
)
private
var
cachedNonIncluded
=
HashSet
<
Int
>(
15
)
private
val
staticRules
=
mapOf
<
String
,
List
<
Record
<
*
>>>(
"use-application-dns.net"
to
emptyList
()
)
private
var
previousRefreshJob
:
Job
?
=
null
init
{
...
...
@@ -200,6 +204,9 @@ class DnsRuleResolver(context: Context) : LocalResolver(false) {
}
override
fun
canResolve
(
question
:
Question
):
Boolean
{
if
(
staticRules
.
containsKey
(
question
.
name
?.
toString
()
?.
lowercase
()))
{
return
true
}
return
if
((
ruleCount
==
0
||
(
ruleCount
!=
null
&&
ruleCount
==
whitelistCount
))
||
(
question
.
type
!=
Record
.
TYPE
.
A
&&
question
.
type
!=
Record
.
TYPE
.
AAAA
))
{
false
}
else
{
...
...
@@ -223,6 +230,9 @@ class DnsRuleResolver(context: Context) : LocalResolver(false) {
}
override
fun
resolve
(
question
:
Question
):
List
<
Record
<
*
>>
{
if
(
staticRules
.
containsKey
(
question
.
name
?.
toString
()
?.
lowercase
()))
{
return
staticRules
[
question
.
name
?.
toString
()
?.
lowercase
()]
!!
}
val
result
=
resolveResults
.
remove
(
question
.
hashCode
())
return
result
?.
let
{
val
data
=
if
(
question
.
type
==
Record
.
TYPE
.
A
)
{
...
...
Write
Preview
Supports
Markdown
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