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
57f8c0f3
Commit
57f8c0f3
authored
Jan 11, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable notification auto-hiding on Kitkat and below #216
parent
601c2276
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
25 deletions
+52
-25
src/main/jni/Android.mk
src/main/jni/Android.mk
+24
-2
src/main/jni/shadowsocks-libev
src/main/jni/shadowsocks-libev
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+27
-22
No files found.
src/main/jni/Android.mk
View file @
57f8c0f3
...
@@ -160,6 +160,25 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libcork/,$(CORK_SOURCE))
...
@@ -160,6 +160,25 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libcork/,$(CORK_SOURCE))
include
$(BUILD_STATIC_LIBRARY)
include
$(BUILD_STATIC_LIBRARY)
########################################################
## libudns
########################################################
include
$(CLEAR_VARS)
UDNS_SOURCES
:=
udns_dn.c udns_dntosp.c udns_parse.c udns_resolver.c udns_init.c
\
udns_misc.c udns_XtoX.c
\
udns_rr_a.c udns_rr_ptr.c udns_rr_mx.c udns_rr_txt.c udns_bl.c
\
udns_rr_srv.c udns_rr_naptr.c udns_codes.c udns_jran.c
LOCAL_MODULE
:=
libudns
LOCAL_CFLAGS
+=
-O2
-I
$(LOCAL_PATH)
/shadowsocks-libev/libudns
\
-DHAVE_DECL_INET_NTOP
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks-libev/libudns/,
$(UDNS_SOURCES)
)
include
$(BUILD_STATIC_LIBRARY)
########################################################
########################################################
## libev
## libev
########################################################
########################################################
...
@@ -223,12 +242,13 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
...
@@ -223,12 +242,13 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/openssl/include
\
-I
$(LOCAL_PATH)
/openssl/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libipset libcork libsodium
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libipset libcork lib
udns lib
sodium
LOCAL_LDLIBS
:=
-llog
LOCAL_LDLIBS
:=
-llog
...
@@ -247,11 +267,13 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
...
@@ -247,11 +267,13 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
-DSSTUNNEL_JNI
\
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
-DSSTUNNEL_JNI
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/libev/
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libudns
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libcork/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/openssl/include
-I
$(LOCAL_PATH)
/openssl/include
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libsodium
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto libsodium
libcork libudns
LOCAL_LDLIBS
:=
-llog
LOCAL_LDLIBS
:=
-llog
...
...
shadowsocks-libev
@
9cdc3dc7
Subproject commit
2a15e971969a1e068fc93b1c32d27de4814d1de8
Subproject commit
9cdc3dc7ef8e7a87169755a6b4287a5394745dd1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
57f8c0f3
...
@@ -513,6 +513,7 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -513,6 +513,7 @@ class ShadowsocksNatService extends Service with BaseService {
}
}
registerReceiver
(
closeReceiver
,
filter
)
registerReceiver
(
closeReceiver
,
filter
)
if
(
Utils
.
isLollipopOrAbove
)
{
val
screenFilter
=
new
IntentFilter
()
val
screenFilter
=
new
IntentFilter
()
screenFilter
.
addAction
(
Intent
.
ACTION_SCREEN_ON
)
screenFilter
.
addAction
(
Intent
.
ACTION_SCREEN_ON
)
screenFilter
.
addAction
(
Intent
.
ACTION_SCREEN_OFF
)
screenFilter
.
addAction
(
Intent
.
ACTION_SCREEN_OFF
)
...
@@ -538,6 +539,7 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -538,6 +539,7 @@ class ShadowsocksNatService extends Service with BaseService {
}
}
}
}
registerReceiver
(
lockReceiver
,
screenFilter
)
registerReceiver
(
lockReceiver
,
screenFilter
)
}
// send event
// send event
application
.
tracker
.
send
(
new
HitBuilders
.
EventBuilder
()
application
.
tracker
.
send
(
new
HitBuilders
.
EventBuilder
()
...
@@ -606,10 +608,13 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -606,10 +608,13 @@ class ShadowsocksNatService extends Service with BaseService {
unregisterReceiver
(
closeReceiver
)
unregisterReceiver
(
closeReceiver
)
closeReceiver
=
null
closeReceiver
=
null
}
}
if
(
Utils
.
isLollipopOrAbove
)
{
if
(
lockReceiver
!=
null
)
{
if
(
lockReceiver
!=
null
)
{
unregisterReceiver
(
lockReceiver
)
unregisterReceiver
(
lockReceiver
)
lockReceiver
=
null
lockReceiver
=
null
}
}
}
// send event
// send event
application
.
tracker
.
send
(
new
HitBuilders
.
EventBuilder
()
application
.
tracker
.
send
(
new
HitBuilders
.
EventBuilder
()
...
...
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