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
9e6948ca
Commit
9e6948ca
authored
Jan 22, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix switch to VPN button in Snackbar
parent
18302e1c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
mobile/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
...n/scala/com/github/shadowsocks/GlobalConfigFragment.scala
+15
-1
mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala
.../src/main/scala/com/github/shadowsocks/MainActivity.scala
+1
-1
No files found.
mobile/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
View file @
9e6948ca
...
@@ -20,13 +20,16 @@
...
@@ -20,13 +20,16 @@
package
com.github.shadowsocks
package
com.github.shadowsocks
import
android.content.SharedPreferences
import
android.content.SharedPreferences.OnSharedPreferenceChangeListener
import
android.os.Bundle
import
android.os.Bundle
import
android.support.design.widget.Snackbar
import
android.support.design.widget.Snackbar
import
android.support.v14.preference.SwitchPreference
import
android.support.v14.preference.SwitchPreference
import
be.mygod.preference.PreferenceFragment
import
be.mygod.preference.PreferenceFragment
import
com.github.shadowsocks.utils.
{
Key
,
TcpFastOpen
}
import
com.github.shadowsocks.utils.
{
Key
,
TcpFastOpen
}
import
com.github.shadowsocks.ShadowsocksApplication.app
class
GlobalConfigFragment
extends
PreferenceFragment
{
class
GlobalConfigFragment
extends
PreferenceFragment
with
OnSharedPreferenceChangeListener
{
override
def
onCreatePreferences
(
bundle
:
Bundle
,
key
:
String
)
{
override
def
onCreatePreferences
(
bundle
:
Bundle
,
key
:
String
)
{
addPreferencesFromResource
(
R
.
xml
.
pref_global
)
addPreferencesFromResource
(
R
.
xml
.
pref_global
)
val
switch
=
findPreference
(
Key
.
isAutoConnect
).
asInstanceOf
[
SwitchPreference
]
val
switch
=
findPreference
(
Key
.
isAutoConnect
).
asInstanceOf
[
SwitchPreference
]
...
@@ -53,5 +56,16 @@ class GlobalConfigFragment extends PreferenceFragment {
...
@@ -53,5 +56,16 @@ class GlobalConfigFragment extends PreferenceFragment {
tfo
.
setEnabled
(
false
)
tfo
.
setEnabled
(
false
)
tfo
.
setSummary
(
getString
(
R
.
string
.
tcp_fastopen_summary_unsupported
,
java
.
lang
.
System
.
getProperty
(
"os.version"
)))
tfo
.
setSummary
(
getString
(
R
.
string
.
tcp_fastopen_summary_unsupported
,
java
.
lang
.
System
.
getProperty
(
"os.version"
)))
}
}
app
.
settings
.
registerOnSharedPreferenceChangeListener
(
this
)
}
override
def
onDestroy
()
{
app
.
settings
.
unregisterOnSharedPreferenceChangeListener
(
this
)
super
.
onDestroy
()
}
def
onSharedPreferenceChanged
(
pref
:
SharedPreferences
,
key
:
String
)
:
Unit
=
key
match
{
case
Key
.
isNAT
=>
findPreference
(
key
).
asInstanceOf
[
SwitchPreference
].
setChecked
(
pref
.
getBoolean
(
key
,
false
))
case
_
=>
}
}
}
}
mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala
View file @
9e6948ca
...
@@ -170,7 +170,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
...
@@ -170,7 +170,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
override
def
onServiceDisconnected
()
:
Unit
=
changeState
(
State
.
IDLE
)
override
def
onServiceDisconnected
()
:
Unit
=
changeState
(
State
.
IDLE
)
private
def
addDisableNatToSnackbar
(
snackbar
:
Snackbar
)
=
snackbar
.
setAction
(
R
.
string
.
switch_to_vpn
,
(
_
=>
private
def
addDisableNatToSnackbar
(
snackbar
:
Snackbar
)
=
snackbar
.
setAction
(
R
.
string
.
switch_to_vpn
,
(
_
=>
if
(
state
==
State
.
STOPPED
)
app
.
editor
.
putBoolean
(
Key
.
isNAT
,
false
))
:
View.OnClickListener
)
if
(
state
==
State
.
STOPPED
)
app
.
editor
.
putBoolean
(
Key
.
isNAT
,
false
)
.
apply
()
)
:
View.OnClickListener
)
override
def
binderDied
()
{
override
def
binderDied
()
{
detachService
()
detachService
()
...
...
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