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
93d468c5
Commit
93d468c5
authored
Dec 24, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine no selected profile case again
parent
2be75d0b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
src/main/scala/com/github/shadowsocks/BaseService.scala
src/main/scala/com/github/shadowsocks/BaseService.scala
+2
-2
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
+3
-4
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
...scala/com/github/shadowsocks/ShadowsocksApplication.scala
+1
-1
No files found.
src/main/scala/com/github/shadowsocks/BaseService.scala
View file @
93d468c5
...
...
@@ -107,7 +107,7 @@ trait BaseService extends Service {
}
}
override
def
use
(
profileId
:
Int
)
:
Unit
=
synchronized
{
override
def
use
(
profileId
:
Int
)
:
Unit
=
synchronized
(
if
(
profileId
<
0
)
stopRunner
(
stopService
=
true
)
else
{
val
profile
=
app
.
profileManager
.
getProfile
(
profileId
).
orNull
if
(
profile
==
null
)
stopRunner
(
stopService
=
true
,
"Please select a profile."
)
else
state
match
{
// TODO: localize
case
State
.
STOPPED
=>
if
(
checkProfile
(
profile
))
startRunner
(
profile
)
...
...
@@ -117,7 +117,7 @@ trait BaseService extends Service {
}
case
_
=>
Log
.
w
(
BaseService
.
this
.
getClass
.
getSimpleName
,
"Illegal state when invoking use: "
+
state
)
}
}
}
)
override
def
useSync
(
profileId
:
Int
)
:
Unit
=
use
(
profileId
)
}
...
...
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
View file @
93d468c5
...
...
@@ -181,10 +181,8 @@ final class ProfilesFragment extends ToolbarFragment with OnMenuItemClickListene
profiles
.
insert
(
index
,
item
)
notifyItemInserted
(
index
)
}
def
commit
(
actions
:
Iterator
[(
Int
,
Profile
)])
:
Unit
=
for
((
_
,
item
)
<-
actions
)
{
app
.
profileManager
.
delProfile
(
item
.
id
)
if
(
item
.
id
==
app
.
profileId
)
app
.
profileId
(-
1
)
}
def
commit
(
actions
:
Iterator
[(
Int
,
Profile
)])
:
Unit
=
for
((
_
,
item
)
<-
actions
)
app
.
profileManager
.
delProfile
(
item
.
id
)
def
refreshId
(
id
:
Int
)
{
val
index
=
profiles
.
indexWhere
(
_
.
id
==
id
)
...
...
@@ -197,6 +195,7 @@ final class ProfilesFragment extends ToolbarFragment with OnMenuItemClickListene
val
index
=
profiles
.
indexWhere
(
_
.
id
==
id
)
profiles
.
remove
(
index
)
notifyItemRemoved
(
index
)
if
(
id
==
app
.
profileId
)
app
.
profileId
(
0
)
}
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
View file @
93d468c5
...
...
@@ -83,7 +83,7 @@ class ShadowsocksApplication extends Application {
.
setFatal
(
false
)
.
build
())
def
profileId
:
Int
=
settings
.
getInt
(
Key
.
id
,
-
1
)
def
profileId
:
Int
=
settings
.
getInt
(
Key
.
id
,
0
)
def
profileId
(
i
:
Int
)
:
Unit
=
editor
.
putInt
(
Key
.
id
,
i
).
apply
()
def
currentProfile
:
Option
[
Profile
]
=
profileManager
.
getProfile
(
profileId
)
...
...
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