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
997eb799
Unverified
Commit
997eb799
authored
Oct 02, 2018
by
Max Lv
Committed by
GitHub
Oct 02, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1967 from Mygod/handler
Replace TimerTask with Handler
parents
53009c7c
8ed652eb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
29 deletions
+28
-29
core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
+28
-29
No files found.
core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
View file @
997eb799
...
@@ -28,6 +28,7 @@ import android.content.IntentFilter
...
@@ -28,6 +28,7 @@ import android.content.IntentFilter
import
android.os.Build
import
android.os.Build
import
android.os.IBinder
import
android.os.IBinder
import
android.os.RemoteCallbackList
import
android.os.RemoteCallbackList
import
android.os.SystemClock
import
android.util.Base64
import
android.util.Base64
import
android.util.Log
import
android.util.Log
import
androidx.core.os.UserManagerCompat
import
androidx.core.os.UserManagerCompat
...
@@ -81,7 +82,6 @@ object BaseService {
...
@@ -81,7 +82,6 @@ object BaseService {
@Volatile
var
pluginPath
:
String
?
=
null
@Volatile
var
pluginPath
:
String
?
=
null
val
processes
=
GuardedProcessPool
()
val
processes
=
GuardedProcessPool
()
var
timer
:
Timer
?
=
null
var
trafficMonitorThread
:
TrafficMonitorThread
?
=
null
var
trafficMonitorThread
:
TrafficMonitorThread
?
=
null
val
callbacks
=
RemoteCallbackList
<
IShadowsocksServiceCallback
>()
val
callbacks
=
RemoteCallbackList
<
IShadowsocksServiceCallback
>()
...
@@ -103,15 +103,13 @@ object BaseService {
...
@@ -103,15 +103,13 @@ object BaseService {
override
fun
registerCallback
(
cb
:
IShadowsocksServiceCallback
)
{
override
fun
registerCallback
(
cb
:
IShadowsocksServiceCallback
)
{
callbacks
.
register
(
cb
)
callbacks
.
register
(
cb
)
}
}
override
fun
startListeningForBandwidth
(
cb
:
IShadowsocksServiceCallback
)
{
if
(
bandwidthListeners
.
add
(
cb
.
asBinder
()))
{
private
fun
registerTimeout
()
=
if
(
timer
==
null
)
{
Core
.
handler
.
postAtTime
(
this
::
onTimeout
,
this
,
SystemClock
.
uptimeMillis
()
+
1000
)
val
t
=
Timer
(
true
)
private
fun
onTimeout
()
{
t
.
schedule
(
object
:
TimerTask
()
{
val
profile
=
profile
override
fun
run
()
{
if
(
profile
!=
null
&&
state
==
CONNECTED
&&
TrafficMonitor
.
updateRate
()
&&
val
profile
=
profile
?:
return
bandwidthListeners
.
isNotEmpty
())
{
if
(
state
==
CONNECTED
&&
TrafficMonitor
.
updateRate
())
Core
.
handler
.
post
{
if
(
bandwidthListeners
.
isNotEmpty
())
{
val
txRate
=
TrafficMonitor
.
txRate
val
txRate
=
TrafficMonitor
.
txRate
val
rxRate
=
TrafficMonitor
.
rxRate
val
rxRate
=
TrafficMonitor
.
rxRate
val
txTotal
=
TrafficMonitor
.
txTotal
val
txTotal
=
TrafficMonitor
.
txTotal
...
@@ -126,11 +124,13 @@ object BaseService {
...
@@ -126,11 +124,13 @@ object BaseService {
}
}
callbacks
.
finishBroadcast
()
callbacks
.
finishBroadcast
()
}
}
registerTimeout
()
}
}
}
},
1000
,
1000
)
override
fun
startListeningForBandwidth
(
cb
:
IShadowsocksServiceCallback
)
{
timer
=
t
val
wasEmpty
=
bandwidthListeners
.
isEmpty
()
}
if
(
bandwidthListeners
.
add
(
cb
.
asBinder
()))
{
if
(
wasEmpty
)
registerTimeout
()
TrafficMonitor
.
updateRate
()
TrafficMonitor
.
updateRate
()
if
(
state
==
CONNECTED
)
cb
.
trafficUpdated
(
profile
!!
.
id
,
if
(
state
==
CONNECTED
)
cb
.
trafficUpdated
(
profile
!!
.
id
,
TrafficMonitor
.
txRate
,
TrafficMonitor
.
rxRate
,
TrafficMonitor
.
txRate
,
TrafficMonitor
.
rxRate
,
...
@@ -140,8 +140,7 @@ object BaseService {
...
@@ -140,8 +140,7 @@ object BaseService {
override
fun
stopListeningForBandwidth
(
cb
:
IShadowsocksServiceCallback
)
{
override
fun
stopListeningForBandwidth
(
cb
:
IShadowsocksServiceCallback
)
{
if
(
bandwidthListeners
.
remove
(
cb
.
asBinder
())
&&
bandwidthListeners
.
isEmpty
())
{
if
(
bandwidthListeners
.
remove
(
cb
.
asBinder
())
&&
bandwidthListeners
.
isEmpty
())
{
timer
!!
.
cancel
()
Core
.
handler
.
removeCallbacksAndMessages
(
this
)
timer
=
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