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
2f682ef3
Commit
2f682ef3
authored
Nov 30, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix service reattaching on entering settings
parent
d3903cbc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
mobile/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
...n/scala/com/github/shadowsocks/GlobalConfigFragment.scala
+1
-4
mobile/src/main/scala/com/github/shadowsocks/preference/OrmLitePreferenceDataStore.scala
...b/shadowsocks/preference/OrmLitePreferenceDataStore.scala
+8
-0
No files found.
mobile/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
View file @
2f682ef3
...
@@ -32,10 +32,7 @@ import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompatDividers
...
@@ -32,10 +32,7 @@ import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompatDividers
class
GlobalConfigFragment
extends
PreferenceFragmentCompatDividers
{
class
GlobalConfigFragment
extends
PreferenceFragmentCompatDividers
{
override
def
onCreatePreferencesFix
(
bundle
:
Bundle
,
key
:
String
)
{
override
def
onCreatePreferencesFix
(
bundle
:
Bundle
,
key
:
String
)
{
getPreferenceManager
.
setPreferenceDataStore
(
app
.
dataStore
)
getPreferenceManager
.
setPreferenceDataStore
(
app
.
dataStore
)
app
.
dataStore
.
putString
(
Key
.
serviceMode
,
app
.
dataStore
.
serviceMode
)
// temporary workaround for support lib bug
app
.
dataStore
.
initGlobal
()
app
.
dataStore
.
putString
(
Key
.
portProxy
,
app
.
dataStore
.
portProxy
.
toString
)
app
.
dataStore
.
putString
(
Key
.
portLocalDns
,
app
.
dataStore
.
portLocalDns
.
toString
)
app
.
dataStore
.
putString
(
Key
.
portTransproxy
,
app
.
dataStore
.
portTransproxy
.
toString
)
addPreferencesFromResource
(
R
.
xml
.
pref_global
)
addPreferencesFromResource
(
R
.
xml
.
pref_global
)
val
switch
=
findPreference
(
Key
.
isAutoConnect
).
asInstanceOf
[
SwitchPreference
]
val
switch
=
findPreference
(
Key
.
isAutoConnect
).
asInstanceOf
[
SwitchPreference
]
switch
.
setOnPreferenceChangeListener
((
_
,
value
)
=>
{
switch
.
setOnPreferenceChangeListener
((
_
,
value
)
=>
{
...
...
mobile/src/main/scala/com/github/shadowsocks/preference/OrmLitePreferenceDataStore.scala
View file @
2f682ef3
...
@@ -125,4 +125,12 @@ final class OrmLitePreferenceDataStore(dbHelper: DBHelper) extends PreferenceDat
...
@@ -125,4 +125,12 @@ final class OrmLitePreferenceDataStore(dbHelper: DBHelper) extends PreferenceDat
def
plugin_=
(
value
:
String
)
:
Unit
=
putString
(
Key
.
plugin
,
value
)
def
plugin_=
(
value
:
String
)
:
Unit
=
putString
(
Key
.
plugin
,
value
)
def
dirty
:
Boolean
=
getBoolean
(
Key
.
dirty
)
def
dirty
:
Boolean
=
getBoolean
(
Key
.
dirty
)
def
dirty_=
(
value
:
Boolean
)
:
Unit
=
putBoolean
(
Key
.
dirty
,
value
)
def
dirty_=
(
value
:
Boolean
)
:
Unit
=
putBoolean
(
Key
.
dirty
,
value
)
def
initGlobal
()
{
// temporary workaround for support lib bug
if
(
getString
(
Key
.
serviceMode
)
==
null
)
putString
(
Key
.
serviceMode
,
serviceMode
)
if
(
getString
(
Key
.
portProxy
)
==
null
)
putString
(
Key
.
portProxy
,
portProxy
.
toString
)
if
(
getString
(
Key
.
portLocalDns
)
==
null
)
putString
(
Key
.
portLocalDns
,
portLocalDns
.
toString
)
if
(
getString
(
Key
.
portTransproxy
)
==
null
)
putString
(
Key
.
portTransproxy
,
portTransproxy
.
toString
)
}
}
}
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