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
7ab3eb34
Commit
7ab3eb34
authored
Jun 06, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to Q beta 4/final API
parent
2991d0ab
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
30 deletions
+28
-30
build.gradle
build.gradle
+4
-4
core/build.gradle
core/build.gradle
+1
-1
core/src/main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
.../main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
+6
-8
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
+3
-5
core/src/main/java/com/github/shadowsocks/utils/Utils.kt
core/src/main/java/com/github/shadowsocks/utils/Utils.kt
+5
-3
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
...om/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
+4
-4
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
...main/java/com/github/shadowsocks/ProfileConfigFragment.kt
+2
-2
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+3
-3
No files found.
build.gradle
View file @
7ab3eb34
...
...
@@ -7,11 +7,11 @@ buildscript {
javaVersion
=
JavaVersion
.
VERSION_1_8
kotlinVersion
=
'1.3.31'
minSdkVersion
=
21
sdkVersion
=
2
8
compileSdkVersion
=
'android-Q'
sdkVersion
=
2
9
compileSdkVersion
=
29
junitVersion
=
'4.12'
androidTestVersion
=
'1.2.0
-beta01
'
androidEspressoVersion
=
'3.2.0
-beta01
'
androidTestVersion
=
'1.2.0'
androidEspressoVersion
=
'3.2.0'
versionCode
=
4080050
versionName
=
'4.8.0-nightly'
resConfigs
=
[
'es'
,
'fa'
,
'fr'
,
'ja'
,
'ko'
,
'ru'
,
'tr'
,
'zh-rCN'
,
'zh-rTW'
]
...
...
core/build.gradle
View file @
7ab3eb34
...
...
@@ -54,7 +54,7 @@ dependencies {
api
"androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
api
'androidx.preference:preference:1.1.0-
alpha05
'
api
'androidx.preference:preference:1.1.0-
beta01
'
api
"androidx.room:room-runtime:$roomVersion"
api
'androidx.work:work-runtime-ktx:2.0.1'
api
'com.crashlytics.sdk.android:crashlytics:2.10.1'
...
...
core/src/main/java/com/github/shadowsocks/bg/DnsResolverCompat.kt
View file @
7ab3eb34
...
...
@@ -23,10 +23,8 @@ package com.github.shadowsocks.bg
import
android.annotation.TargetApi
import
android.net.DnsResolver
import
android.net.Network
import
android.
net.ParseException
import
android.
os.Build
import
android.os.CancellationSignal
import
android.system.ErrnoException
import
androidx.core.os.BuildCompat
import
com.github.shadowsocks.Core
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.GlobalScope
...
...
@@ -39,7 +37,7 @@ import kotlin.coroutines.resumeWithException
sealed
class
DnsResolverCompat
{
companion
object
:
DnsResolverCompat
()
{
private
val
instance
by
lazy
{
if
(
Build
Compat
.
isAtLeastQ
()
)
DnsResolverCompat29
else
DnsResolverCompat21
}
private
val
instance
by
lazy
{
if
(
Build
.
VERSION
.
SDK_INT
>=
29
)
DnsResolverCompat29
else
DnsResolverCompat21
}
override
suspend
fun
resolve
(
network
:
Network
,
host
:
String
)
=
instance
.
resolve
(
network
,
host
)
override
suspend
fun
resolveOnActiveNetwork
(
host
:
String
)
=
instance
.
resolveOnActiveNetwork
(
host
)
...
...
@@ -70,10 +68,10 @@ sealed class DnsResolverCompat {
cont
.
invokeOnCancellation
{
signal
.
cancel
()
}
// retry should be handled by client instead
DnsResolver
.
getInstance
().
query
(
network
,
host
,
DnsResolver
.
FLAG_NO_RETRY
,
InPlaceExecutor
,
signal
,
object
:
DnsResolver
.
InetAddressAnswerCallback
()
{
override
fun
onAnswer
(
answer
:
MutableList
<
InetAddress
>)
=
cont
.
resume
(
answer
.
toTypedArray
())
override
fun
onQueryException
(
exception
:
ErrnoException
)
=
cont
.
resumeWithException
(
exception
)
override
fun
on
ParseException
(
exception
:
ParseException
)
=
cont
.
resumeWithException
(
exception
)
signal
,
object
:
DnsResolver
.
Callback
<
Collection
<
InetAddress
>>
{
override
fun
onAnswer
(
answer
:
Collection
<
InetAddress
>,
rcode
:
Int
)
=
cont
.
resume
(
answer
.
toTypedArray
()
)
override
fun
on
Error
(
error
:
DnsResolver
.
DnsException
)
=
cont
.
resumeWithException
(
error
)
})
}
}
...
...
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
View file @
7ab3eb34
...
...
@@ -30,7 +30,6 @@ import android.os.Build
import
android.os.ParcelFileDescriptor
import
android.system.ErrnoException
import
android.system.Os
import
androidx.core.os.BuildCompat
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.VpnRequestActivity
import
com.github.shadowsocks.acl.Acl
...
...
@@ -109,9 +108,8 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
if
(
active
&&
Build
.
VERSION
.
SDK_INT
>=
22
)
setUnderlyingNetworks
(
underlyingNetworks
)
}
private
val
underlyingNetworks
get
()
=
// clearing underlyingNetworks makes Android 9+ consider the network to be metered
if
(
Build
.
VERSION
.
SDK_INT
==
28
&&
!
BuildCompat
.
isAtLeastQ
()
&&
metered
)
null
else
underlyingNetwork
?.
let
{
arrayOf
(
it
)
}
// clearing underlyingNetworks makes Android 9 consider the network to be metered
if
(
Build
.
VERSION
.
SDK_INT
==
28
&&
metered
)
null
else
underlyingNetwork
?.
let
{
arrayOf
(
it
)
}
override
fun
onBind
(
intent
:
Intent
)
=
when
(
intent
.
action
)
{
SERVICE_INTERFACE
->
super
<
BaseVpnService
>.
onBind
(
intent
)
...
...
@@ -199,7 +197,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
active
=
true
// possible race condition here?
if
(
Build
.
VERSION
.
SDK_INT
>=
22
)
{
builder
.
setUnderlyingNetworks
(
underlyingNetworks
)
if
(
Build
Compat
.
isAtLeastQ
()
)
builder
.
setMetered
(
metered
)
if
(
Build
.
VERSION
.
SDK_INT
>=
29
)
builder
.
setMetered
(
metered
)
}
val
conn
=
builder
.
establish
()
?:
throw
NullConnectionException
()
...
...
core/src/main/java/com/github/shadowsocks/utils/Utils.kt
View file @
7ab3eb34
...
...
@@ -35,10 +35,12 @@ import android.system.Os
import
android.system.OsConstants
import
android.util.TypedValue
import
androidx.annotation.AttrRes
import
androidx.core.os.BuildCompat
import
androidx.preference.Preference
import
com.crashlytics.android.Crashlytics
import
kotlinx.coroutines.*
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.suspendCancellableCoroutine
import
kotlinx.coroutines.withContext
import
java.net.HttpURLConnection
import
java.net.InetAddress
import
kotlin.coroutines.resume
...
...
@@ -57,7 +59,7 @@ private val parseNumericAddress by lazy @SuppressLint("DiscouragedPrivateApi") {
*/
fun
String
?.
parseNumericAddress
():
InetAddress
?
=
Os
.
inet_pton
(
OsConstants
.
AF_INET
,
this
)
?:
Os
.
inet_pton
(
OsConstants
.
AF_INET6
,
this
)
?.
let
{
if
(
Build
Compat
.
isAtLeastQ
()
)
it
else
parseNumericAddress
.
invoke
(
null
,
this
)
as
InetAddress
if
(
Build
.
VERSION
.
SDK_INT
>=
29
)
it
else
parseNumericAddress
.
invoke
(
null
,
this
)
as
InetAddress
}
fun
<
K
,
V
>
MutableMap
<
K
,
V
>.
computeIfAbsentCompat
(
key
:
K
,
value
:
()
->
V
)
=
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
...
...
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
View file @
7ab3eb34
...
...
@@ -78,15 +78,15 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
tfo
.
summary
=
getString
(
R
.
string
.
tcp_fastopen_summary_unsupported
,
System
.
getProperty
(
"os.version"
))
}
hosts
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Monospace
hosts
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Monospace
)
hosts
.
summaryProvider
=
HostsSummaryProvider
val
serviceMode
=
findPreference
<
Preference
>(
Key
.
serviceMode
)
!!
val
portProxy
=
findPreference
<
EditTextPreference
>(
Key
.
portProxy
)
!!
portProxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portProxy
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
val
portLocalDns
=
findPreference
<
EditTextPreference
>(
Key
.
portLocalDns
)
!!
portLocalDns
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portLocalDns
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
val
portTransproxy
=
findPreference
<
EditTextPreference
>(
Key
.
portTransproxy
)
!!
portTransproxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portTransproxy
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
val
onServiceModeChange
=
Preference
.
OnPreferenceChangeListener
{
_
,
newValue
->
val
(
enabledLocalDns
,
enabledTransproxy
)
=
when
(
newValue
as
String
?)
{
Key
.
modeProxy
->
Pair
(
false
,
false
)
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
View file @
7ab3eb34
...
...
@@ -74,7 +74,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
val
activity
=
requireActivity
()
profileId
=
activity
.
intent
.
getLongExtra
(
Action
.
EXTRA_PROFILE_ID
,
-
1L
)
addPreferencesFromResource
(
R
.
xml
.
pref_profile
)
findPreference
<
EditTextPreference
>(
Key
.
remotePort
)
!!
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
findPreference
<
EditTextPreference
>(
Key
.
remotePort
)
!!
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
findPreference
<
EditTextPreference
>(
Key
.
password
)
!!
.
summaryProvider
=
PasswordSummaryProvider
val
serviceMode
=
DataStore
.
serviceMode
findPreference
<
Preference
>(
Key
.
remoteDns
)
!!
.
isEnabled
=
serviceMode
!=
Key
.
modeProxy
...
...
@@ -104,7 +104,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
}
true
}
pluginConfigure
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Monospace
pluginConfigure
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Monospace
)
pluginConfigure
.
onPreferenceChangeListener
=
this
initPlugins
()
receiver
=
Core
.
listenForPackageChanges
(
false
)
{
initPlugins
()
}
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
7ab3eb34
...
...
@@ -184,11 +184,11 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
serviceMode
=
findPreference
(
Key
.
serviceMode
)
!!
shareOverLan
=
findPreference
(
Key
.
shareOverLan
)
!!
portProxy
=
findPreference
(
Key
.
portProxy
)
!!
portProxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portProxy
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
portLocalDns
=
findPreference
(
Key
.
portLocalDns
)
!!
portLocalDns
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portLocalDns
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
portTransproxy
=
findPreference
(
Key
.
portTransproxy
)
!!
portTransproxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portTransproxy
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
serviceMode
.
onPreferenceChangeListener
=
onServiceModeChange
findPreference
<
Preference
>(
Key
.
about
)
!!
.
summary
=
getString
(
R
.
string
.
about_title
,
BuildConfig
.
VERSION_NAME
)
...
...
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