Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
fa6eee94
Commit
fa6eee94
authored
May 08, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update API to Q beta 3
parent
d9430f50
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
17 deletions
+23
-17
core/src/main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
.../main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
+19
-12
core/src/main/java/com/github/shadowsocks/utils/Utils.kt
core/src/main/java/com/github/shadowsocks/utils/Utils.kt
+4
-5
No files found.
core/src/main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
View file @
fa6eee94
...
...
@@ -23,19 +23,22 @@ package com.github.shadowsocks.bg
import
android.annotation.TargetApi
import
android.net.DnsResolver
import
android.net.Network
import
android.os.Handler
import
android.os.HandlerThread
import
android.net.ParseException
import
android.os.CancellationSignal
import
android.system.ErrnoException
import
androidx.core.os.BuildCompat
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.async
import
kotlinx.coroutines.suspendCancellableCoroutine
import
java.net.InetAddress
import
java.util.concurrent.Executor
import
kotlin.coroutines.resume
import
kotlin.coroutines.resumeWithException
sealed
class
DnsResolverCompat
{
companion
object
:
DnsResolverCompat
()
{
private
val
instance
by
lazy
{
if
(
BuildCompat
.
isAtLeastQ
())
DnsResolverCompat29
()
else
DnsResolverCompat21
}
private
val
instance
by
lazy
{
if
(
BuildCompat
.
isAtLeastQ
())
DnsResolverCompat29
else
DnsResolverCompat21
}
override
suspend
fun
resolve
(
network
:
Network
,
host
:
String
)
=
instance
.
resolve
(
network
,
host
)
}
...
...
@@ -48,18 +51,22 @@ sealed class DnsResolverCompat {
}
@TargetApi
(
29
)
private
class
DnsResolverCompat29
:
DnsResolverCompat
()
{
private
val
handler
=
Handler
(
HandlerThread
(
"DnsResolverCompat"
).
run
{
start
()
looper
})
private
object
DnsResolverCompat29
:
DnsResolverCompat
()
{
/**
* This executor will run on its caller directly. On Q beta 3, this is called in main thread.
*/
private
val
executor
=
Executor
{
it
.
run
()
}
override
suspend
fun
resolve
(
network
:
Network
,
host
:
String
):
Array
<
InetAddress
>
{
return
suspendCancellableCoroutine
{
cont
->
val
signal
=
CancellationSignal
()
cont
.
invokeOnCancellation
{
signal
.
cancel
()
}
// retry should be handled by client instead
DnsResolver
.
getInstance
().
query
(
network
,
host
,
DnsResolver
.
FLAG_NO_RETRY
,
handler
)
{
cont
.
resume
(
it
.
toTypedArray
())
}
DnsResolver
.
getInstance
().
query
(
network
,
host
,
DnsResolver
.
FLAG_NO_RETRY
,
executor
,
signal
,
object
:
DnsResolver
.
InetAddressAnswerCallback
()
{
override
fun
onAnswer
(
answer
:
MutableList
<
InetAddress
>)
=
cont
.
resume
(
answer
.
toTypedArray
())
override
fun
onQueryException
(
exception
:
ErrnoException
)
=
cont
.
resumeWithException
(
exception
)
override
fun
onParseException
(
exception
:
ParseException
)
=
cont
.
resumeWithException
(
exception
)
})
}
}
}
...
...
core/src/main/java/com/github/shadowsocks/utils/Utils.kt
View file @
fa6eee94
...
...
@@ -20,6 +20,7 @@
package
com.github.shadowsocks.utils
import
android.annotation.SuppressLint
import
android.content.BroadcastReceiver
import
android.content.ContentResolver
import
android.content.Context
...
...
@@ -28,7 +29,6 @@ import android.content.pm.PackageInfo
import
android.content.res.Resources
import
android.graphics.BitmapFactory
import
android.graphics.ImageDecoder
import
android.net.InetAddresses
import
android.net.Uri
import
android.os.Build
import
android.system.Os
...
...
@@ -46,7 +46,7 @@ import java.net.InetAddress
val
Throwable
.
readableMessage
get
()
=
localizedMessage
?:
javaClass
.
name
private
val
parseNumericAddress
by
lazy
{
private
val
parseNumericAddress
by
lazy
@SuppressLint
(
"DiscouragedPrivateApi"
)
{
InetAddress
::
class
.
java
.
getDeclaredMethod
(
"parseNumericAddress"
,
String
::
class
.
java
).
apply
{
isAccessible
=
true
}
...
...
@@ -54,12 +54,11 @@ private val parseNumericAddress by lazy {
/**
* A slightly more performant variant of parseNumericAddress.
*
* Bug: https://issuetracker.google.com/issues/123456213
* Bug
in Android 9.0 and lower
: https://issuetracker.google.com/issues/123456213
*/
fun
String
?.
parseNumericAddress
():
InetAddress
?
=
Os
.
inet_pton
(
OsConstants
.
AF_INET
,
this
)
?:
Os
.
inet_pton
(
OsConstants
.
AF_INET6
,
this
)
?.
let
{
if
(
BuildCompat
.
isAtLeastQ
())
InetAddresses
.
parseNumericAddress
(
this
)
else
parseNumericAddress
.
invoke
(
null
,
this
)
as
InetAddress
if
(
BuildCompat
.
isAtLeastQ
())
it
else
parseNumericAddress
.
invoke
(
null
,
this
)
as
InetAddress
}
fun
HttpURLConnection
.
disconnectFromMain
()
{
...
...
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