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
5493bcea
Commit
5493bcea
authored
Mar 15, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to preference 1.1.0-alpha04
parent
952ec45c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
32 deletions
+32
-32
core/build.gradle
core/build.gradle
+1
-1
core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
.../main/java/com/github/shadowsocks/preference/DataStore.kt
+1
-1
core/src/main/java/com/github/shadowsocks/preference/OnPreferenceDataStoreChangeListener.kt
...owsocks/preference/OnPreferenceDataStoreChangeListener.kt
+1
-1
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
...om/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
+7
-7
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+1
-1
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
...main/java/com/github/shadowsocks/ProfileConfigFragment.kt
+9
-9
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+12
-12
No files found.
core/build.gradle
View file @
5493bcea
...
...
@@ -51,7 +51,7 @@ dependencies {
api
"android.arch.work:work-runtime-ktx:$workVersion"
api
"androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
api
'androidx.preference:preference:1.1.0-alpha0
3
'
api
'androidx.preference:preference:1.1.0-alpha0
4
'
api
"androidx.room:room-runtime:$roomVersion"
api
'com.crashlytics.sdk.android:crashlytics:2.9.9'
api
'com.google.firebase:firebase-config:16.1.3'
...
...
core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
View file @
5493bcea
...
...
@@ -42,7 +42,7 @@ object DataStore : OnPreferenceDataStoreChangeListener {
publicStore
.
registerChangeListener
(
this
)
}
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
?
)
{
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
)
{
when
(
key
)
{
Key
.
id
->
if
(
DataStore
.
directBootAware
)
DirectBoot
.
update
()
}
...
...
core/src/main/java/com/github/shadowsocks/preference/OnPreferenceDataStoreChangeListener.kt
View file @
5493bcea
...
...
@@ -23,5 +23,5 @@ package com.github.shadowsocks.preference
import
androidx.preference.PreferenceDataStore
interface
OnPreferenceDataStoreChangeListener
{
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
?
)
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
)
}
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
View file @
5493bcea
...
...
@@ -39,7 +39,7 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
preferenceManager
.
preferenceDataStore
=
DataStore
.
publicStore
DataStore
.
initGlobal
()
addPreferencesFromResource
(
R
.
xml
.
pref_global
)
val
boot
=
findPreference
<
SwitchPreference
>(
Key
.
isAutoConnect
)
val
boot
=
findPreference
<
SwitchPreference
>(
Key
.
isAutoConnect
)
!!
boot
.
setOnPreferenceChangeListener
{
_
,
value
->
BootReceiver
.
enabled
=
value
as
Boolean
true
...
...
@@ -47,13 +47,13 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
boot
.
isChecked
=
BootReceiver
.
enabled
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
boot
.
setSummary
(
R
.
string
.
auto_connect_summary_v24
)
val
canToggleLocked
=
findPreference
<
Preference
>(
Key
.
directBootAware
)
val
canToggleLocked
=
findPreference
<
Preference
>(
Key
.
directBootAware
)
!!
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
canToggleLocked
.
setOnPreferenceChangeListener
{
_
,
newValue
->
if
(
Core
.
directBootSupported
&&
newValue
as
Boolean
)
DirectBoot
.
update
()
else
DirectBoot
.
clean
()
true
}
else
canToggleLocked
.
remove
()
val
tfo
=
findPreference
<
SwitchPreference
>(
Key
.
tfo
)
val
tfo
=
findPreference
<
SwitchPreference
>(
Key
.
tfo
)
!!
tfo
.
isChecked
=
DataStore
.
tcpFastOpen
tfo
.
setOnPreferenceChangeListener
{
_
,
value
->
if
(
value
as
Boolean
&&
!
TcpFastOpen
.
sendEnabled
)
{
...
...
@@ -70,12 +70,12 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
tfo
.
summary
=
getString
(
R
.
string
.
tcp_fastopen_summary_unsupported
,
System
.
getProperty
(
"os.version"
))
}
val
serviceMode
=
findPreference
<
Preference
>(
Key
.
serviceMode
)
val
portProxy
=
findPreference
<
EditTextPreference
>(
Key
.
portProxy
)
val
serviceMode
=
findPreference
<
Preference
>(
Key
.
serviceMode
)
!!
val
portProxy
=
findPreference
<
EditTextPreference
>(
Key
.
portProxy
)
!!
portProxy
.
onBindEditTextListener
=
PortPreferenceListener
val
portLocalDns
=
findPreference
<
EditTextPreference
>(
Key
.
portLocalDns
)
val
portLocalDns
=
findPreference
<
EditTextPreference
>(
Key
.
portLocalDns
)
!!
portLocalDns
.
onBindEditTextListener
=
PortPreferenceListener
val
portTransproxy
=
findPreference
<
EditTextPreference
>(
Key
.
portTransproxy
)
val
portTransproxy
=
findPreference
<
EditTextPreference
>(
Key
.
portTransproxy
)
!!
portTransproxy
.
onBindEditTextListener
=
PortPreferenceListener
val
onServiceModeChange
=
Preference
.
OnPreferenceChangeListener
{
_
,
newValue
->
val
(
enabledLocalDns
,
enabledTransproxy
)
=
when
(
newValue
as
String
?)
{
...
...
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
5493bcea
...
...
@@ -209,7 +209,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
else
ImportProfilesDialogFragment
().
withArg
(
ProfilesArg
(
profiles
)).
show
(
supportFragmentManager
,
null
)
}
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
?
)
{
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
)
{
when
(
key
)
{
Key
.
serviceMode
->
handler
.
post
{
connection
.
disconnect
(
this
)
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
View file @
5493bcea
...
...
@@ -76,20 +76,20 @@ 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
=
PortPreferenceListener
findPreference
<
EditTextPreference
>(
Key
.
password
).
summaryProvider
=
PasswordSummaryProvider
findPreference
<
EditTextPreference
>(
Key
.
remotePort
)
!!
.
onBindEditTextListener
=
PortPreferenceListener
findPreference
<
EditTextPreference
>(
Key
.
password
)
!!
.
summaryProvider
=
PasswordSummaryProvider
val
serviceMode
=
DataStore
.
serviceMode
findPreference
<
Preference
>(
Key
.
remoteDns
).
isEnabled
=
serviceMode
!=
Key
.
modeProxy
isProxyApps
=
findPreference
(
Key
.
proxyApps
)
findPreference
<
Preference
>(
Key
.
remoteDns
)
!!
.
isEnabled
=
serviceMode
!=
Key
.
modeProxy
isProxyApps
=
findPreference
(
Key
.
proxyApps
)
!!
isProxyApps
.
isEnabled
=
serviceMode
==
Key
.
modeVpn
isProxyApps
.
setOnPreferenceClickListener
{
startActivity
(
Intent
(
activity
,
AppManager
::
class
.
java
))
isProxyApps
.
isChecked
=
true
false
}
findPreference
<
Preference
>(
Key
.
udpdns
).
isEnabled
=
serviceMode
!=
Key
.
modeProxy
plugin
=
findPreference
(
Key
.
plugin
)
pluginConfigure
=
findPreference
(
Key
.
pluginConfigure
)
findPreference
<
Preference
>(
Key
.
udpdns
)
!!
.
isEnabled
=
serviceMode
!=
Key
.
modeProxy
plugin
=
findPreference
(
Key
.
plugin
)
!!
pluginConfigure
=
findPreference
(
Key
.
pluginConfigure
)
!!
plugin
.
unknownValueSummary
=
getString
(
R
.
string
.
plugin_unknown
)
plugin
.
setOnPreferenceChangeListener
{
_
,
newValue
->
pluginConfiguration
=
PluginConfiguration
(
pluginConfiguration
.
pluginsOptions
,
newValue
as
String
)
...
...
@@ -105,7 +105,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
pluginConfigure
.
onPreferenceChangeListener
=
this
initPlugins
()
receiver
=
Core
.
listenForPackageChanges
(
false
)
{
initPlugins
()
}
udpFallback
=
findPreference
(
Key
.
udpFallback
)
udpFallback
=
findPreference
(
Key
.
udpFallback
)
!!
DataStore
.
privateStore
.
registerChangeListener
(
this
)
}
...
...
@@ -159,7 +159,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
false
}
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
?
)
{
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
)
{
if
(
key
!=
Key
.
proxyApps
&&
findPreference
<
Preference
>(
key
)
!=
null
)
DataStore
.
dirty
=
true
}
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
5493bcea
...
...
@@ -153,12 +153,12 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
preferenceManager
.
preferenceDataStore
=
DataStore
.
publicStore
DataStore
.
initGlobal
()
addPreferencesFromResource
(
R
.
xml
.
pref_main
)
fab
=
findPreference
(
Key
.
id
)
fab
=
findPreference
(
Key
.
id
)
!!
populateProfiles
()
stats
=
findPreference
(
Key
.
controlStats
)
controlImport
=
findPreference
(
Key
.
controlImport
)
stats
=
findPreference
(
Key
.
controlStats
)
!!
controlImport
=
findPreference
(
Key
.
controlImport
)
!!
findPreference
<
SwitchPreference
>(
Key
.
isAutoConnect
).
apply
{
findPreference
<
SwitchPreference
>(
Key
.
isAutoConnect
)
!!
.
apply
{
setOnPreferenceChangeListener
{
_
,
value
->
BootReceiver
.
enabled
=
value
as
Boolean
true
...
...
@@ -166,7 +166,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
isChecked
=
BootReceiver
.
enabled
}
tfo
=
findPreference
(
Key
.
tfo
)
tfo
=
findPreference
(
Key
.
tfo
)
!!
tfo
.
isChecked
=
DataStore
.
tcpFastOpen
tfo
.
setOnPreferenceChangeListener
{
_
,
value
->
if
(
value
as
Boolean
&&
!
TcpFastOpen
.
sendEnabled
)
{
...
...
@@ -183,16 +183,16 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
tfo
.
summary
=
getString
(
R
.
string
.
tcp_fastopen_summary_unsupported
,
System
.
getProperty
(
"os.version"
))
}
serviceMode
=
findPreference
(
Key
.
serviceMode
)
shareOverLan
=
findPreference
(
Key
.
shareOverLan
)
portProxy
=
findPreference
(
Key
.
portProxy
)
serviceMode
=
findPreference
(
Key
.
serviceMode
)
!!
shareOverLan
=
findPreference
(
Key
.
shareOverLan
)
!!
portProxy
=
findPreference
(
Key
.
portProxy
)
!!
portProxy
.
onBindEditTextListener
=
PortPreferenceListener
portLocalDns
=
findPreference
(
Key
.
portLocalDns
)
portLocalDns
=
findPreference
(
Key
.
portLocalDns
)
!!
portLocalDns
.
onBindEditTextListener
=
PortPreferenceListener
portTransproxy
=
findPreference
(
Key
.
portTransproxy
)
portTransproxy
=
findPreference
(
Key
.
portTransproxy
)
!!
portTransproxy
.
onBindEditTextListener
=
PortPreferenceListener
serviceMode
.
onPreferenceChangeListener
=
onServiceModeChange
findPreference
<
Preference
>(
Key
.
about
).
apply
{
findPreference
<
Preference
>(
Key
.
about
)
!!
.
apply
{
summary
=
getString
(
R
.
string
.
about_title
,
BuildConfig
.
VERSION_NAME
)
setOnPreferenceClickListener
{
Toast
.
makeText
(
requireContext
(),
"https://shadowsocks.org/android"
,
Toast
.
LENGTH_SHORT
).
show
()
...
...
@@ -236,7 +236,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
}
}
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
?
)
{
override
fun
onPreferenceDataStoreChanged
(
store
:
PreferenceDataStore
,
key
:
String
)
{
when
(
key
)
{
Key
.
serviceMode
->
handler
.
post
{
connection
.
disconnect
(
requireContext
())
...
...
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