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
7fdf437e
Commit
7fdf437e
authored
Feb 23, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a crash of auto startup
parent
9de6c744
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
project/Build.scala
project/Build.scala
+2
-2
src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
...la/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
+12
-9
No files found.
project/Build.scala
View file @
7fdf437e
...
...
@@ -5,8 +5,8 @@ import sbtandroid._
import
sbtandroid.AndroidPlugin._
object
App
{
val
version
=
"2.0.
8
"
val
versionCode
=
59
val
version
=
"2.0.
9
"
val
versionCode
=
60
}
object
General
{
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
View file @
7fdf437e
...
...
@@ -53,14 +53,6 @@ class ShadowsocksRunnerActivity extends Activity {
lazy
val
settings
=
PreferenceManager
.
getDefaultSharedPreferences
(
this
)
val
handler
=
new
Handler
()
val
receiver
=
new
BroadcastReceiver
()
{
override
def
onReceive
(
context
:
Context
,
intent
:
Intent
)
{
if
(
intent
.
getAction
==
Intent
.
ACTION_USER_PRESENT
)
{
attachService
()
}
}
}
val
connection
=
new
ServiceConnection
{
override
def
onServiceConnected
(
name
:
ComponentName
,
service
:
IBinder
)
{
bgService
=
IShadowsocksService
.
Stub
.
asInterface
(
service
)
...
...
@@ -76,6 +68,7 @@ class ShadowsocksRunnerActivity extends Activity {
// Variables
var
vpnEnabled
=
-
1
var
bgService
:
IShadowsocksService
=
null
var
receiver
:
BroadcastReceiver
=
null
def
isVpnEnabled
:
Boolean
=
{
if
(
vpnEnabled
<
0
)
{
...
...
@@ -127,6 +120,13 @@ class ShadowsocksRunnerActivity extends Activity {
val
locked
=
km
.
inKeyguardRestrictedInputMode
if
(
locked
)
{
val
filter
=
new
IntentFilter
(
Intent
.
ACTION_USER_PRESENT
)
receiver
=
new
BroadcastReceiver
()
{
override
def
onReceive
(
context
:
Context
,
intent
:
Intent
)
{
if
(
intent
.
getAction
==
Intent
.
ACTION_USER_PRESENT
)
{
attachService
()
}
}
}
registerReceiver
(
receiver
,
filter
)
}
else
{
attachService
()
...
...
@@ -136,7 +136,10 @@ class ShadowsocksRunnerActivity extends Activity {
override
def
onDestroy
()
{
super
.
onDestroy
()
deattachService
()
if
(
receiver
!=
null
)
{
unregisterReceiver
(
receiver
)
receiver
=
null
;
}
}
override
def
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
)
{
...
...
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