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
fe81182d
Commit
fe81182d
authored
Nov 20, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #438 from Mygod/master
Fix #437
parents
84da64fa
6766b8c3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
3 deletions
+8
-3
project/plugins.sbt
project/plugins.sbt
+1
-1
src/main/res/values-zh/strings.xml
src/main/res/values-zh/strings.xml
+1
-0
src/main/res/values/strings.xml
src/main/res/values/strings.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/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+4
-1
No files found.
project/plugins.sbt
View file @
fe81182d
resolvers
+=
Resolver
.
url
(
"scalasbt releases"
,
new
URL
(
"http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"
))(
Resolver
.
ivyStylePatterns
)
addSbtPlugin
(
"com.hanhuy.sbt"
%
"android-sdk-plugin"
%
"1.5.
8
"
)
addSbtPlugin
(
"com.hanhuy.sbt"
%
"android-sdk-plugin"
%
"1.5.
9
"
)
resolvers
+=
"Sonatype snapshots"
at
"https://oss.sonatype.org/content/repositories/snapshots/"
addSbtPlugin
(
"com.github.mpeltonen"
%
"sbt-idea"
%
"1.7.0-SNAPSHOT"
)
...
...
src/main/res/values-zh/strings.xml
View file @
fe81182d
...
...
@@ -40,6 +40,7 @@
<string
name=
"stop"
>
停止服务
</string>
<string
name=
"stopping"
>
正在关闭……
</string>
<string
name=
"vpn_error"
>
后台服务启动失败:%s
</string>
<string
name=
"reboot_required"
>
VPN 服务启动失败。你可能需要重启设备。
</string>
<string
name=
"close"
>
关闭
</string>
<string
name=
"proxy_empty"
>
代理服务器地址不能为空
</string>
<string
name=
"connect"
>
连接
</string>
...
...
src/main/res/values/strings.xml
View file @
fe81182d
...
...
@@ -66,6 +66,7 @@
<string
name=
"stop"
>
Stop the service
</string>
<string
name=
"stopping"
>
Shutting down…
</string>
<string
name=
"vpn_error"
>
%s
</string>
<string
name=
"reboot_required"
>
Failed to start VPN service. You might need to reboot your device.
</string>
<!-- alert category -->
<string
name=
"close"
>
Close
</string>
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
fe81182d
...
...
@@ -337,7 +337,7 @@ class Shadowsocks
if
(
intent
!=
null
)
{
startActivityForResult
(
intent
,
Shadowsocks
.
REQUEST_CONNECT
)
}
else
{
onActivityResult
(
Shadowsocks
.
REQUEST_CONNECT
,
Activity
.
RESULT_OK
,
null
)
handler
.
post
(()
=>
onActivityResult
(
Shadowsocks
.
REQUEST_CONNECT
,
Activity
.
RESULT_OK
,
null
)
)
}
}
else
{
serviceStart
()
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
fe81182d
...
...
@@ -442,11 +442,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
try
{
conn
=
builder
.
establish
()
if
(
conn
==
null
)
changeState
(
State
.
STOPPED
,
getString
(
R
.
string
.
reboot_required
))
}
catch
{
case
ex
:
IllegalStateException
=>
changeState
(
State
.
STOPPED
,
ex
.
getMessage
)
conn
=
null
case
ex
:
Exception
=>
conn
=
null
case
ex
:
Exception
=>
ex
.
printStackTrace
()
conn
=
null
}
if
(
conn
==
null
)
{
...
...
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