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
4b37d88f
Commit
4b37d88f
authored
Nov 29, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refine VPN mode on L
parent
8ee5d77c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
15 deletions
+4
-15
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+1
-0
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+1
-13
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+1
-1
No files found.
src/main/AndroidManifest.xml
View file @
4b37d88f
...
...
@@ -80,6 +80,7 @@
<service
android:name=
".ShadowsocksVpnService"
android:process=
":vpn"
android:label=
"@string/app_name"
android:permission=
"android.permission.BIND_VPN_SERVICE"
android:exported=
"false"
>
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
4b37d88f
...
...
@@ -775,7 +775,7 @@ class Shadowsocks
if
(
pref
!=
null
)
{
if
(
Seq
(
Key
.
isGlobalProxy
,
Key
.
proxyedApps
)
.
contains
(
name
))
{
pref
.
setEnabled
(
enabled
&&
(!
isVpnEnabled
))
pref
.
setEnabled
(
enabled
&&
(
Utils
.
isLollipopOrAbove
||
!
isVpnEnabled
))
}
else
{
pref
.
setEnabled
(
enabled
)
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
4b37d88f
...
...
@@ -41,7 +41,6 @@ package com.github.shadowsocks
import
java.io.File
import
java.lang.reflect.
{
InvocationTargetException
,
Method
}
import
java.util.Timer
import
android.app.
{
Notification
,
NotificationManager
,
PendingIntent
,
Service
}
import
android.content._
...
...
@@ -86,11 +85,6 @@ class ShadowsocksNatService extends Service with BaseService {
private
var
mStartForegroundArgs
=
new
Array
[
AnyRef
](
2
)
private
var
mStopForegroundArgs
=
new
Array
[
AnyRef
](
1
)
private
var
lastTxRate
=
0
private
var
lastRxRate
=
0
private
var
timer
:
Timer
=
null
private
val
TIMER_INTERVAL
=
2
private
lazy
val
application
=
getApplication
.
asInstanceOf
[
ShadowsocksApplication
]
def
setDnsForAllNetwork
(
dns
:
String
)
{
...
...
@@ -543,12 +537,6 @@ class ShadowsocksNatService extends Service with BaseService {
.
setLabel
(
getVersionName
)
.
build
())
// reset timer
if
(
timer
!=
null
)
{
timer
.
cancel
()
timer
=
null
}
// reset NAT
killProcesses
()
...
...
@@ -564,7 +552,7 @@ class ShadowsocksNatService extends Service with BaseService {
}
override
def
stopBackgroundService
()
{
stop
Runner
()
stop
Self
()
}
override
def
getTag
=
TAG
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
4b37d88f
...
...
@@ -479,7 +479,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
override
def
stopBackgroundService
()
{
stop
Runner
()
stop
Self
()
}
override
def
getTag
=
TAG
...
...
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