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
4d7bf8d7
Commit
4d7bf8d7
authored
Dec 26, 2015
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce battery usage - Unregister callbacks onStop
parent
0018a7ca
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
15 deletions
+31
-15
src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
...scala/com/github/shadowsocks/ProfileManagerActivity.scala
+9
-0
src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
...in/scala/com/github/shadowsocks/ServiceBoundContext.scala
+17
-15
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+5
-0
No files found.
src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
View file @
4d7bf8d7
...
@@ -218,6 +218,15 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
...
@@ -218,6 +218,15 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
}
}
}
}
override
def
onStart
()
{
super
.
onStart
()
registerCallback
}
override
def
onStop
()
{
super
.
onStop
()
unregisterCallback
}
override
def
onDestroy
{
override
def
onDestroy
{
deattachService
()
deattachService
()
super
.
onDestroy
super
.
onDestroy
...
...
src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
View file @
4d7bf8d7
...
@@ -13,20 +13,12 @@ trait ServiceBoundContext extends Context {
...
@@ -13,20 +13,12 @@ trait ServiceBoundContext extends Context {
class
ShadowsocksServiceConnection
extends
ServiceConnection
{
class
ShadowsocksServiceConnection
extends
ServiceConnection
{
override
def
onServiceConnected
(
name
:
ComponentName
,
service
:
IBinder
)
{
override
def
onServiceConnected
(
name
:
ComponentName
,
service
:
IBinder
)
{
bgService
=
IShadowsocksService
.
Stub
.
asInterface
(
service
)
bgService
=
IShadowsocksService
.
Stub
.
asInterface
(
service
)
if
(
callback
!=
null
)
try
{
registerCallback
bgService
.
registerCallback
(
callback
)
}
catch
{
case
ignored
:
RemoteException
=>
// Nothing
}
ServiceBoundContext
.
this
.
onServiceConnected
()
ServiceBoundContext
.
this
.
onServiceConnected
()
}
}
override
def
onServiceDisconnected
(
name
:
ComponentName
)
{
override
def
onServiceDisconnected
(
name
:
ComponentName
)
{
if
(
callback
!=
null
)
{
if
(
callback
!=
null
)
{
try
{
unregisterCallback
if
(
bgService
!=
null
)
bgService
.
unregisterCallback
(
callback
)
}
catch
{
case
ignored
:
RemoteException
=>
// Nothing
}
callback
=
null
callback
=
null
}
}
ServiceBoundContext
.
this
.
onServiceDisconnected
()
ServiceBoundContext
.
this
.
onServiceDisconnected
()
...
@@ -34,11 +26,25 @@ trait ServiceBoundContext extends Context {
...
@@ -34,11 +26,25 @@ trait ServiceBoundContext extends Context {
}
}
}
}
def
registerCallback
=
if
(
bgService
!=
null
&&
callback
!=
null
&&
!
callbackRegistered
)
try
{
bgService
.
registerCallback
(
callback
)
callbackRegistered
=
true
}
catch
{
case
ignored
:
RemoteException
=>
// Nothing
}
def
unregisterCallback
=
if
(
bgService
!=
null
&&
callback
!=
null
&&
callbackRegistered
)
try
{
bgService
.
unregisterCallback
(
callback
)
callbackRegistered
=
false
}
catch
{
case
ignored
:
RemoteException
=>
// Nothing
}
def
onServiceConnected
()
=
()
def
onServiceConnected
()
=
()
def
onServiceDisconnected
()
=
()
def
onServiceDisconnected
()
=
()
private
var
callback
:
IShadowsocksServiceCallback.Stub
=
_
private
var
callback
:
IShadowsocksServiceCallback.Stub
=
_
private
var
connection
:
ShadowsocksServiceConnection
=
_
private
var
connection
:
ShadowsocksServiceConnection
=
_
private
var
callbackRegistered
:
Boolean
=
_
// Variables
// Variables
var
bgService
:
IShadowsocksService
=
_
var
bgService
:
IShadowsocksService
=
_
...
@@ -60,11 +66,7 @@ trait ServiceBoundContext extends Context {
...
@@ -60,11 +66,7 @@ trait ServiceBoundContext extends Context {
def
deattachService
()
{
def
deattachService
()
{
if
(
bgService
!=
null
)
{
if
(
bgService
!=
null
)
{
if
(
callback
!=
null
)
{
if
(
callback
!=
null
)
{
try
{
unregisterCallback
bgService
.
unregisterCallback
(
callback
)
}
catch
{
case
ignored
:
RemoteException
=>
// Nothing
}
callback
=
null
callback
=
null
}
}
if
(
connection
!=
null
)
{
if
(
connection
!=
null
)
{
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
4d7bf8d7
...
@@ -461,8 +461,13 @@ class Shadowsocks
...
@@ -461,8 +461,13 @@ class Shadowsocks
preferences
.
update
(
profile
)
preferences
.
update
(
profile
)
}
}
override
def
onStart
()
{
super
.
onStart
()
registerCallback
}
override
def
onStop
()
{
override
def
onStop
()
{
super
.
onStop
()
super
.
onStop
()
unregisterCallback
clearDialog
()
clearDialog
()
}
}
...
...
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