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
89b9914f
Commit
89b9914f
authored
Oct 14, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ETXTBSY in copyAssets
parent
809b81a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
28 deletions
+23
-28
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+3
-28
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
...scala/com/github/shadowsocks/ShadowsocksApplication.scala
+20
-0
No files found.
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
89b9914f
...
...
@@ -63,9 +63,7 @@ import com.github.shadowsocks.database._
import
com.github.shadowsocks.utils.CloseUtils._
import
com.github.shadowsocks.utils._
import
com.google.android.gms.ads.
{
AdRequest
,
AdSize
,
AdView
}
import
eu.chainfire.libsuperuser.Shell
import
scala.collection.mutable.ArrayBuffer
import
scala.util.Random
object
Typefaces
{
...
...
@@ -189,8 +187,8 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
}
override
def
binderDied
{
detachService
crashRecovery
detachService
()
app
.
crashRecovery
()
attachService
}
...
...
@@ -228,23 +226,6 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
}
}
def
crashRecovery
()
{
val
cmd
=
new
ArrayBuffer
[
String
]()
for
(
task
<-
Array
(
"ss-local"
,
"ss-tunnel"
,
"pdnsd"
,
"redsocks"
,
"tun2socks"
,
"kcptun"
))
{
cmd
.
append
(
"killall %s"
.
formatLocal
(
Locale
.
ENGLISH
,
task
))
cmd
.
append
(
"rm -f %1$s/%2$s-nat.conf %1$s/%2$s-vpn.conf"
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
task
))
}
if
(
app
.
isNatEnabled
)
{
cmd
.
append
(
"iptables -t nat -F OUTPUT"
)
cmd
.
append
(
"echo done"
)
val
result
=
Shell
.
SU
.
run
(
cmd
.
toArray
)
if
(
result
!=
null
&&
!
result
.
isEmpty
)
return
// fallback to SH
}
Shell
.
SH
.
run
(
cmd
.
toArray
)
}
def
cancelStart
()
{
clearDialog
()
changeSwitch
(
checked
=
false
)
...
...
@@ -463,17 +444,11 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
handler
.
removeCallbacksAndMessages
(
null
)
}
def
reset
()
{
crashRecovery
()
app
.
copyAssets
()
}
def
recovery
()
{
if
(
serviceStarted
)
serviceStop
()
val
h
=
showProgress
(
R
.
string
.
recovering
)
Utils
.
ThrowableFuture
{
reset
()
app
.
copyAssets
()
h
.
sendEmptyMessage
(
0
)
}
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
View file @
89b9914f
...
...
@@ -62,6 +62,8 @@ import com.google.android.gms.tagmanager.{ContainerHolder, TagManager}
import
com.j256.ormlite.logger.LocalLog
import
eu.chainfire.libsuperuser.Shell
import
scala.collection.mutable.ArrayBuffer
object
ShadowsocksApplication
{
var
app
:
ShadowsocksApplication
=
_
...
...
@@ -207,7 +209,25 @@ class ShadowsocksApplication extends Application {
IOUtils
.
copy
(
in
,
out
)))
}
def
crashRecovery
()
{
val
cmd
=
new
ArrayBuffer
[
String
]()
for
(
task
<-
Array
(
"ss-local"
,
"ss-tunnel"
,
"pdnsd"
,
"redsocks"
,
"tun2socks"
,
"kcptun"
))
{
cmd
.
append
(
"killall %s"
.
formatLocal
(
Locale
.
ENGLISH
,
task
))
cmd
.
append
(
"rm -f %1$s/%2$s-nat.conf %1$s/%2$s-vpn.conf"
.
formatLocal
(
Locale
.
ENGLISH
,
getApplicationInfo
.
dataDir
,
task
))
}
if
(
app
.
isNatEnabled
)
{
cmd
.
append
(
"iptables -t nat -F OUTPUT"
)
cmd
.
append
(
"echo done"
)
val
result
=
Shell
.
SU
.
run
(
cmd
.
toArray
)
if
(
result
!=
null
&&
!
result
.
isEmpty
)
return
// fallback to SH
}
Shell
.
SH
.
run
(
cmd
.
toArray
)
}
def
copyAssets
()
{
crashRecovery
()
// ensure executables are killed before writing to them
copyAssets
(
System
.
getABI
)
copyAssets
(
"acl"
)
Shell
.
SH
.
run
(
EXECUTABLES
.
map
(
"chmod 755 "
+
getApplicationInfo
.
dataDir
+
'/'
+
_
))
...
...
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