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
faa1e5de
Commit
faa1e5de
authored
Dec 05, 2015
by
Mygod
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/shadowsocks/shadowsocks-android
parents
873560be
d2a10272
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
10 deletions
+21
-10
src/main/jni/Android.mk
src/main/jni/Android.mk
+2
-2
src/main/jni/shadowsocks-libev
src/main/jni/shadowsocks-libev
+1
-1
src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
...in/scala/com/github/shadowsocks/ServiceBoundContext.scala
+11
-3
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
...in/scala/com/github/shadowsocks/ShadowsocksSettings.scala
+7
-4
No files found.
src/main/jni/Android.mk
View file @
faa1e5de
...
...
@@ -254,7 +254,7 @@ SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c j
LOCAL_MODULE
:=
ss-local
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-D
UDPRELAY
_LOCAL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-D
MODULE
_LOCAL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-I
$(LOCAL_PATH)
/libev
\
-I
$(LOCAL_PATH)
/libancillary
\
...
...
@@ -281,7 +281,7 @@ SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c
LOCAL_MODULE
:=
ss-tunnel
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/src/,
$(SHADOWSOCKS_SOURCES)
)
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-D
UDPRELAY_LOCAL
-DUDPRELAY
_TUNNEL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-D
MODULE
_TUNNEL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
-DSSTUNNEL_JNI
\
-I
$(LOCAL_PATH)
/libev
\
-I
$(LOCAL_PATH)
/libancillary
\
...
...
shadowsocks-libev
@
eeac81e8
Subproject commit
c5155e4a59c1965203b2f894c4f3c06358fa3a65
Subproject commit
eeac81e8faa225b381223559811e1e477a195d2c
src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
View file @
faa1e5de
...
...
@@ -9,7 +9,8 @@ import com.github.shadowsocks.utils.Action
* @author Mygod
*/
trait
ServiceBoundContext
extends
Context
{
val
connection
=
new
ServiceConnection
{
class
ShadowsocksServiceConnection
extends
ServiceConnection
{
override
def
onServiceConnected
(
name
:
ComponentName
,
service
:
IBinder
)
{
bgService
=
IShadowsocksService
.
Stub
.
asInterface
(
service
)
if
(
callback
!=
null
)
try
{
...
...
@@ -37,6 +38,7 @@ trait ServiceBoundContext extends Context {
def
onServiceDisconnected
()
=
()
private
var
callback
:
IShadowsocksServiceCallback.Stub
=
_
private
var
connection
:
ShadowsocksServiceConnection
=
_
// Variables
var
bgService
:
IShadowsocksService
=
_
...
...
@@ -46,9 +48,13 @@ trait ServiceBoundContext extends Context {
if
(
bgService
==
null
)
{
val
s
=
if
(
ShadowsocksApplication
.
isVpnEnabled
)
classOf
[
ShadowsocksVpnService
]
else
classOf
[
ShadowsocksNatService
]
val
intent
=
new
Intent
(
this
,
s
)
intent
.
setAction
(
Action
.
SERVICE
)
connection
=
new
ShadowsocksServiceConnection
()
bindService
(
intent
,
connection
,
Context
.
BIND_AUTO_CREATE
)
startService
(
new
Intent
(
this
,
s
))
}
}
...
...
@@ -62,8 +68,10 @@ trait ServiceBoundContext extends Context {
case
ignored
:
RemoteException
=>
// Nothing
}
}
unbindService
(
connection
)
bgService
=
null
if
(
connection
!=
null
)
{
unbindService
(
connection
)
connection
=
null
}
}
}
}
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
View file @
faa1e5de
...
...
@@ -73,10 +73,13 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
}
def
onSharedPreferenceChanged
(
sharedPreferences
:
SharedPreferences
,
key
:
String
)
=
key
match
{
case
Key
.
isNAT
=>
if
(
ShadowsocksApplication
.
isRoot
)
activity
.
handler
.
post
(()
=>
{
activity
.
deattachService
()
activity
.
attachService
()
})
case
Key
.
isNAT
=>
if
(
ShadowsocksApplication
.
isRoot
&&
activity
!=
null
)
{
activity
.
handler
.
post
(()
=>
{
val
intent
=
activity
.
getIntent
activity
.
finish
()
startActivity
(
intent
)
})
}
case
_
=>
}
}
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