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
42e93039
Commit
42e93039
authored
Nov 15, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Output more information on failure of preparing VpnService
Fix #1424.
parent
e0bf727b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
mobile/src/main/res/values/strings.xml
mobile/src/main/res/values/strings.xml
+1
-0
mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala
.../src/main/scala/com/github/shadowsocks/MainActivity.scala
+3
-1
No files found.
mobile/src/main/res/values/strings.xml
View file @
42e93039
...
@@ -72,6 +72,7 @@
...
@@ -72,6 +72,7 @@
<string
name=
"stop"
>
Stop
</string>
<string
name=
"stop"
>
Stop
</string>
<string
name=
"stopping"
>
Shutting down…
</string>
<string
name=
"stopping"
>
Shutting down…
</string>
<string
name=
"vpn_error"
>
%s
</string>
<string
name=
"vpn_error"
>
%s
</string>
<string
name=
"vpn_permission_denied"
>
Permission denied to create a VPN service
</string>
<string
name=
"reboot_required"
>
Failed to start VPN service. You might need to reboot your device.
</string>
<string
name=
"reboot_required"
>
Failed to start VPN service. You might need to reboot your device.
</string>
<string
name=
"profile_invalid_input"
>
No valid profile data found.
</string>
<string
name=
"profile_invalid_input"
>
No valid profile data found.
</string>
...
...
mobile/src/main/scala/com/github/shadowsocks/MainActivity.scala
View file @
42e93039
...
@@ -167,7 +167,9 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
...
@@ -167,7 +167,9 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
override
def
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
)
:
Unit
=
resultCode
match
{
override
def
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
)
:
Unit
=
resultCode
match
{
case
Activity
.
RESULT_OK
=>
Utils
.
startSsService
(
this
)
case
Activity
.
RESULT_OK
=>
Utils
.
startSsService
(
this
)
case
_
=>
Log
.
e
(
TAG
,
"Failed to start VpnService"
)
case
_
=>
Snackbar
.
make
(
findViewById
(
R
.
id
.
snackbar
),
R
.
string
.
vpn_permission_denied
,
Snackbar
.
LENGTH_LONG
).
show
()
Log
.
e
(
TAG
,
"Failed to start VpnService: %s"
.
formatLocal
(
Locale
.
ENGLISH
,
data
.
toString
))
}
}
override
def
onCreate
(
savedInstanceState
:
Bundle
)
{
override
def
onCreate
(
savedInstanceState
:
Bundle
)
{
...
...
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