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
445461f3
Commit
445461f3
authored
Apr 19, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable hosts and local DNS settings always
parent
b4b038a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
21 deletions
+6
-21
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
...om/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
+3
-11
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+3
-10
No files found.
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
View file @
445461f3
...
...
@@ -91,25 +91,17 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
val
portTransproxy
=
findPreference
<
EditTextPreference
>(
Key
.
portTransproxy
)
!!
portTransproxy
.
setOnBindEditTextListener
(
EditTextPreferenceModifiers
.
Port
)
val
onServiceModeChange
=
Preference
.
OnPreferenceChangeListener
{
_
,
newValue
->
val
(
enabledLocalDns
,
enabledTransproxy
)
=
when
(
newValue
as
String
?)
{
Key
.
modeProxy
->
Pair
(
false
,
false
)
Key
.
modeVpn
->
Pair
(
true
,
false
)
Key
.
modeTransproxy
->
Pair
(
true
,
true
)
else
->
throw
IllegalArgumentException
(
"newValue: $newValue"
)
}
hosts
.
isEnabled
=
enabledLocalDns
portLocalDns
.
isEnabled
=
enabledLocalDns
portTransproxy
.
isEnabled
=
enabledTransproxy
portTransproxy
.
isEnabled
=
newValue
as
String
?
==
Key
.
modeTransproxy
true
}
val
listener
:
(
BaseService
.
State
)
->
Unit
=
{
val
stopped
=
it
==
BaseService
.
State
.
Stopped
tfo
.
isEnabled
=
stopped
hosts
.
isEnabled
=
stopped
serviceMode
.
isEnabled
=
stopped
portProxy
.
isEnabled
=
stopped
portLocalDns
.
isEnabled
=
stopped
if
(
stopped
)
onServiceModeChange
.
onPreferenceChange
(
null
,
DataStore
.
serviceMode
)
else
{
hosts
.
isEnabled
=
false
portLocalDns
.
isEnabled
=
false
portTransproxy
.
isEnabled
=
false
}
}
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
445461f3
...
...
@@ -76,15 +76,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
private
lateinit
var
portLocalDns
:
EditTextPreference
private
lateinit
var
portTransproxy
:
EditTextPreference
private
val
onServiceModeChange
=
Preference
.
OnPreferenceChangeListener
{
_
,
newValue
->
val
(
enabledLocalDns
,
enabledTransproxy
)
=
when
(
newValue
as
String
?)
{
Key
.
modeProxy
->
Pair
(
false
,
false
)
Key
.
modeVpn
->
Pair
(
true
,
false
)
Key
.
modeTransproxy
->
Pair
(
true
,
true
)
else
->
throw
IllegalArgumentException
(
"newValue: $newValue"
)
}
hosts
.
isEnabled
=
enabledLocalDns
portLocalDns
.
isEnabled
=
enabledLocalDns
portTransproxy
.
isEnabled
=
enabledTransproxy
portTransproxy
.
isEnabled
=
newValue
as
String
?
==
Key
.
modeTransproxy
true
}
private
val
tester
by
viewModels
<
HttpsTest
>()
...
...
@@ -125,11 +117,12 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
val
stopped
=
state
==
BaseService
.
State
.
Stopped
controlImport
.
isEnabled
=
stopped
tfo
.
isEnabled
=
stopped
hosts
.
isEnabled
=
stopped
serviceMode
.
isEnabled
=
stopped
shareOverLan
.
isEnabled
=
stopped
portProxy
.
isEnabled
=
stopped
portLocalDns
.
isEnabled
=
stopped
if
(
stopped
)
onServiceModeChange
.
onPreferenceChange
(
null
,
DataStore
.
serviceMode
)
else
{
portLocalDns
.
isEnabled
=
false
portTransproxy
.
isEnabled
=
false
}
}
...
...
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