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
5328f585
Commit
5328f585
authored
Apr 25, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #658
parent
1ddde094
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
4 deletions
+11
-4
src/main/res/values-zh-rCN/strings.xml
src/main/res/values-zh-rCN/strings.xml
+1
-0
src/main/res/values-zh-rTW/strings.xml
src/main/res/values-zh-rTW/strings.xml
+1
-0
src/main/res/values/strings.xml
src/main/res/values/strings.xml
+1
-0
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+4
-3
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+4
-1
No files found.
src/main/res/values-zh-rCN/strings.xml
View file @
5328f585
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<string
name=
"auto_connect_summary"
>
随系统启动后台服务
</string>
<string
name=
"auto_connect_summary"
>
随系统启动后台服务
</string>
<string
name=
"forward_success"
>
后台服务已开始运行。
</string>
<string
name=
"forward_success"
>
后台服务已开始运行。
</string>
<string
name=
"service_failed"
>
无法连接远程服务器
</string>
<string
name=
"service_failed"
>
无法连接远程服务器
</string>
<string
name=
"invalid_server"
>
服务器名无效
</string>
<string
name=
"nat_deprecated"
>
警告:在 Android 5.0 及更高版本中不建议使用 NAT 模式
</string>
<string
name=
"nat_deprecated"
>
警告:在 Android 5.0 及更高版本中不建议使用 NAT 模式
</string>
<string
name=
"nat_no_root"
>
NAT 模式需要 ROOT 权限
</string>
<string
name=
"nat_no_root"
>
NAT 模式需要 ROOT 权限
</string>
<string
name=
"switch_to_vpn"
>
切换到 VPN 模式
</string>
<string
name=
"switch_to_vpn"
>
切换到 VPN 模式
</string>
...
...
src/main/res/values-zh-rTW/strings.xml
View file @
5328f585
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
<string
name=
"auto_connect_summary"
>
在裝置啟動時啟用 Shadowsocks
</string>
<string
name=
"auto_connect_summary"
>
在裝置啟動時啟用 Shadowsocks
</string>
<string
name=
"forward_success"
>
Shadowsocks 已啟動。
</string>
<string
name=
"forward_success"
>
Shadowsocks 已啟動。
</string>
<string
name=
"service_failed"
>
連線至遠端伺服器失敗
</string>
<string
name=
"service_failed"
>
連線至遠端伺服器失敗
</string>
<string
name=
"invalid_server"
>
伺服器名无效
</string>
<string
name=
"nat_deprecated"
>
警告:自 Android 5.0 開始, NAT 模式已過時
</string>
<string
name=
"nat_deprecated"
>
警告:自 Android 5.0 開始, NAT 模式已過時
</string>
<string
name=
"nat_no_root"
>
NAT 模式需要 ROOT 權限
</string>
<string
name=
"nat_no_root"
>
NAT 模式需要 ROOT 權限
</string>
<string
name=
"switch_to_vpn"
>
切換至 VPN 模式
</string>
<string
name=
"switch_to_vpn"
>
切換至 VPN 模式
</string>
...
...
src/main/res/values/strings.xml
View file @
5328f585
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
<!-- notification category -->
<!-- notification category -->
<string
name=
"forward_success"
>
Shadowsocks started.
</string>
<string
name=
"forward_success"
>
Shadowsocks started.
</string>
<string
name=
"invalid_server"
>
Invalid server name
</string>
<string
name=
"service_failed"
>
Failed to connect the remote server
</string>
<string
name=
"service_failed"
>
Failed to connect the remote server
</string>
<string
name=
"nat_deprecated"
>
WARNING: NAT mode has been deprecated since Android 5.0
</string>
<string
name=
"nat_deprecated"
>
WARNING: NAT mode has been deprecated since Android 5.0
</string>
<string
name=
"nat_no_root"
>
NAT mode requires ROOT permission
</string>
<string
name=
"nat_no_root"
>
NAT mode requires ROOT permission
</string>
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
5328f585
...
@@ -418,11 +418,12 @@ class ShadowsocksNatService extends BaseService {
...
@@ -418,11 +418,12 @@ class ShadowsocksNatService extends BaseService {
resolved
=
true
resolved
=
true
}
}
if
(
resolved
&&
handleConnection
)
{
if
(!
resolved
)
{
changeState
(
State
.
STOPPED
,
getString
(
R
.
string
.
invalid_server
))
stopRunner
(
true
)
}
else
if
(
handleConnection
)
{
// Set DNS
// Set DNS
flushDns
()
flushDns
()
changeState
(
State
.
CONNECTED
)
changeState
(
State
.
CONNECTED
)
notification
=
new
ShadowsocksNotification
(
this
,
config
.
profileName
,
true
)
notification
=
new
ShadowsocksNotification
(
this
,
config
.
profileName
,
true
)
}
else
{
}
else
{
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
5328f585
...
@@ -216,7 +216,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -216,7 +216,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
resolved
=
true
resolved
=
true
}
}
if
(
resolved
&&
handleConnection
)
{
if
(!
resolved
)
{
changeState
(
State
.
STOPPED
,
getString
(
R
.
string
.
invalid_server
))
stopRunner
(
true
)
}
else
if
(
handleConnection
)
{
changeState
(
State
.
CONNECTED
)
changeState
(
State
.
CONNECTED
)
notification
=
new
ShadowsocksNotification
(
this
,
config
.
profileName
)
notification
=
new
ShadowsocksNotification
(
this
,
config
.
profileName
)
}
else
{
}
else
{
...
...
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