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
716d50bb
Commit
716d50bb
authored
Dec 11, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Catch DeadObjectException in onServiceConnected
parent
734f2ed8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+6
-1
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+6
-1
No files found.
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
716d50bb
...
...
@@ -28,6 +28,7 @@ import android.net.VpnService
import
android.nfc.NdefMessage
import
android.nfc.NfcAdapter
import
android.os.Bundle
import
android.os.DeadObjectException
import
android.util.Log
import
android.view.KeyCharacterMap
import
android.view.KeyEvent
...
...
@@ -117,7 +118,11 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre
}
override
val
listenForDeath
:
Boolean
get
()
=
true
override
fun
onServiceConnected
(
service
:
IShadowsocksService
)
=
changeState
(
service
.
state
)
override
fun
onServiceConnected
(
service
:
IShadowsocksService
)
=
changeState
(
try
{
service
.
state
}
catch
(
_
:
DeadObjectException
)
{
BaseService
.
IDLE
})
override
fun
onServiceDisconnected
()
=
changeState
(
BaseService
.
IDLE
)
override
fun
binderDied
()
{
super
.
binderDied
()
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
716d50bb
...
...
@@ -26,6 +26,7 @@ import android.content.ActivityNotFoundException
import
android.content.Intent
import
android.net.VpnService
import
android.os.Bundle
import
android.os.DeadObjectException
import
android.text.format.Formatter
import
android.util.Log
import
android.widget.Toast
...
...
@@ -135,7 +136,11 @@ class MainPreferenceFragment : LeanbackPreferenceFragment(), ShadowsocksConnecti
}
override
val
listenForDeath
:
Boolean
get
()
=
true
override
fun
onServiceConnected
(
service
:
IShadowsocksService
)
=
changeState
(
service
.
state
)
override
fun
onServiceConnected
(
service
:
IShadowsocksService
)
=
changeState
(
try
{
service
.
state
}
catch
(
_
:
DeadObjectException
)
{
BaseService
.
IDLE
})
override
fun
onServiceDisconnected
()
=
changeState
(
BaseService
.
IDLE
)
override
fun
binderDied
()
{
super
.
binderDied
()
...
...
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