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
1d799906
Commit
1d799906
authored
Sep 15, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove workaround for libsuperuser#55
parent
2a473621
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
10 deletions
+2
-10
build.sbt
build.sbt
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+1
-9
No files found.
build.sbt
View file @
1d799906
...
...
@@ -41,7 +41,7 @@ libraryDependencies ++= Seq(
"com.j256.ormlite"
%
"ormlite-android"
%
"5.0"
,
"com.twofortyfouram"
%
"android-plugin-api-for-locale"
%
"1.0.2"
,
"dnsjava"
%
"dnsjava"
%
"2.1.7"
,
"eu.chainfire"
%
"libsuperuser"
%
"1.0.0.20160
7041850
"
,
"eu.chainfire"
%
"libsuperuser"
%
"1.0.0.20160
8240809
"
,
"me.dm7.barcodescanner"
%
"zxing"
%
"1.9"
,
"net.glxn.qrgen"
%
"android"
%
"2.0"
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
1d799906
...
...
@@ -304,23 +304,15 @@ class ShadowsocksNatService extends BaseService {
su
.
addCommand
((
init_sb
++
http_sb
).
toArray
)
}
override
def
startRunner
(
profile
:
Profile
)
=
if
(
su
==
null
)
{
override
def
startRunner
(
profile
:
Profile
)
=
if
(
su
==
null
)
su
=
new
Shell
.
Builder
().
useSU
().
setWantSTDERR
(
true
).
setWatchdogTimeout
(
10
).
open
((
_
,
exitCode
,
_
)
=>
if
(
exitCode
==
0
)
super
.
startRunner
(
profile
)
else
{
if
(
su
!=
null
)
{
Log
.
wtf
(
TAG
,
"libsuperuser#55 has been fixed. Please remove the redundant code."
)
su
.
close
()
su
=
null
}
super
.
stopRunner
(
true
,
getString
(
R
.
string
.
nat_no_root
))
})
su
.
waitForIdle
()
if
(!
su
.
isRunning
)
{
su
.
close
()
su
=
null
super
.
stopRunner
(
true
,
getString
(
R
.
string
.
nat_no_root
))
}
}
override
def
connect
()
{
super
.
connect
()
...
...
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