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
2ca6737f
Commit
2ca6737f
authored
Jan 19, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant lazy initialization
parent
d9de5430
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
53 deletions
+46
-53
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+14
-16
mobile/src/main/java/com/github/shadowsocks/bg/TileService.kt
...le/src/main/java/com/github/shadowsocks/bg/TileService.kt
+21
-24
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+11
-13
No files found.
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
2ca6737f
...
...
@@ -92,24 +92,22 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre
// service
var
state
=
BaseService
.
IDLE
override
val
serviceCallback
:
IShadowsocksServiceCallback
.
Stub
by
lazy
{
object
:
IShadowsocksServiceCallback
.
Stub
()
{
override
fun
stateChanged
(
state
:
Int
,
profileName
:
String
?,
msg
:
String
?)
{
Core
.
handler
.
post
{
changeState
(
state
,
msg
,
true
)
}
}
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
Core
.
handler
.
post
{
if
(
profileId
==
0L
)
this
@MainActivity
.
stats
.
updateTraffic
(
stats
.
txRate
,
stats
.
rxRate
,
stats
.
txTotal
,
stats
.
rxTotal
)
if
(
state
!=
BaseService
.
STOPPING
)
{
(
supportFragmentManager
.
findFragmentById
(
R
.
id
.
fragment_holder
)
as
?
ToolbarFragment
)
?.
onTrafficUpdated
(
profileId
,
stats
)
}
override
val
serviceCallback
=
object
:
IShadowsocksServiceCallback
.
Stub
()
{
override
fun
stateChanged
(
state
:
Int
,
profileName
:
String
?,
msg
:
String
?)
{
Core
.
handler
.
post
{
changeState
(
state
,
msg
,
true
)
}
}
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
Core
.
handler
.
post
{
if
(
profileId
==
0L
)
this
@MainActivity
.
stats
.
updateTraffic
(
stats
.
txRate
,
stats
.
rxRate
,
stats
.
txTotal
,
stats
.
rxTotal
)
if
(
state
!=
BaseService
.
STOPPING
)
{
(
supportFragmentManager
.
findFragmentById
(
R
.
id
.
fragment_holder
)
as
?
ToolbarFragment
)
?.
onTrafficUpdated
(
profileId
,
stats
)
}
}
override
fun
trafficPersisted
(
profileId
:
Long
)
{
Core
.
handler
.
post
{
ProfilesFragment
.
instance
?.
onTrafficPersisted
(
profileId
)
}
}
}
override
fun
trafficPersisted
(
profileId
:
Long
)
{
Core
.
handler
.
post
{
ProfilesFragment
.
instance
?.
onTrafficPersisted
(
profileId
)
}
}
}
...
...
mobile/src/main/java/com/github/shadowsocks/bg/TileService.kt
View file @
2ca6737f
...
...
@@ -42,33 +42,30 @@ class TileService : BaseTileService(), ShadowsocksConnection.Interface {
private
val
keyguard
by
lazy
{
getSystemService
<
KeyguardManager
>()
!!
}
private
var
tapPending
=
false
override
val
serviceCallback
:
IShadowsocksServiceCallback
.
Stub
by
lazy
{
@RequiresApi
(
24
)
object
:
IShadowsocksServiceCallback
.
Stub
()
{
override
fun
stateChanged
(
state
:
Int
,
profileName
:
String
?,
msg
:
String
?)
{
val
tile
=
qsTile
?:
return
var
label
:
String
?
=
null
when
(
state
)
{
BaseService
.
STOPPED
->
{
tile
.
icon
=
iconIdle
tile
.
state
=
Tile
.
STATE_INACTIVE
}
BaseService
.
CONNECTED
->
{
tile
.
icon
=
iconConnected
if
(!
keyguard
.
isDeviceLocked
)
label
=
profileName
tile
.
state
=
Tile
.
STATE_ACTIVE
}
else
->
{
tile
.
icon
=
iconBusy
tile
.
state
=
Tile
.
STATE_UNAVAILABLE
}
override
val
serviceCallback
=
object
:
IShadowsocksServiceCallback
.
Stub
()
{
override
fun
stateChanged
(
state
:
Int
,
profileName
:
String
?,
msg
:
String
?)
{
val
tile
=
qsTile
?:
return
var
label
:
String
?
=
null
when
(
state
)
{
BaseService
.
STOPPED
->
{
tile
.
icon
=
iconIdle
tile
.
state
=
Tile
.
STATE_INACTIVE
}
BaseService
.
CONNECTED
->
{
tile
.
icon
=
iconConnected
if
(!
keyguard
.
isDeviceLocked
)
label
=
profileName
tile
.
state
=
Tile
.
STATE_ACTIVE
}
else
->
{
tile
.
icon
=
iconBusy
tile
.
state
=
Tile
.
STATE_UNAVAILABLE
}
tile
.
label
=
label
?:
getString
(
R
.
string
.
app_name
)
tile
.
updateTile
()
}
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
}
override
fun
trafficPersisted
(
profileId
:
Long
)
{
}
tile
.
label
=
label
?:
getString
(
R
.
string
.
app_name
)
tile
.
updateTile
()
}
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
}
override
fun
trafficPersisted
(
profileId
:
Long
)
{
}
}
override
fun
onServiceConnected
(
service
:
IShadowsocksService
)
{
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
2ca6737f
...
...
@@ -89,20 +89,18 @@ class MainPreferenceFragment : LeanbackPreferenceFragment(), ShadowsocksConnecti
// service
var
state
=
BaseService
.
IDLE
private
set
override
val
serviceCallback
:
IShadowsocksServiceCallback
.
Stub
by
lazy
{
object
:
IShadowsocksServiceCallback
.
Stub
()
{
override
fun
stateChanged
(
state
:
Int
,
profileName
:
String
?,
msg
:
String
?)
{
Core
.
handler
.
post
{
changeState
(
state
,
msg
)
}
}
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
if
(
profileId
==
0L
)
this
@MainPreferenceFragment
.
stats
.
summary
=
getString
(
R
.
string
.
stat_summary
,
getString
(
R
.
string
.
speed
,
Formatter
.
formatFileSize
(
activity
,
stats
.
txRate
)),
getString
(
R
.
string
.
speed
,
Formatter
.
formatFileSize
(
activity
,
stats
.
rxRate
)),
Formatter
.
formatFileSize
(
activity
,
stats
.
txTotal
),
Formatter
.
formatFileSize
(
activity
,
stats
.
rxTotal
))
}
override
fun
trafficPersisted
(
profileId
:
Long
)
{
}
override
val
serviceCallback
=
object
:
IShadowsocksServiceCallback
.
Stub
()
{
override
fun
stateChanged
(
state
:
Int
,
profileName
:
String
?,
msg
:
String
?)
{
Core
.
handler
.
post
{
changeState
(
state
,
msg
)
}
}
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
if
(
profileId
==
0L
)
this
@MainPreferenceFragment
.
stats
.
summary
=
getString
(
R
.
string
.
stat_summary
,
getString
(
R
.
string
.
speed
,
Formatter
.
formatFileSize
(
activity
,
stats
.
txRate
)),
getString
(
R
.
string
.
speed
,
Formatter
.
formatFileSize
(
activity
,
stats
.
rxRate
)),
Formatter
.
formatFileSize
(
activity
,
stats
.
txTotal
),
Formatter
.
formatFileSize
(
activity
,
stats
.
rxTotal
))
}
override
fun
trafficPersisted
(
profileId
:
Long
)
{
}
}
private
fun
changeState
(
state
:
Int
,
msg
:
String
?
=
null
)
{
...
...
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