Commit 04c10d4e authored by Max Lv's avatar Max Lv

refine service destroy

parent c8f68e1a
......@@ -372,15 +372,14 @@ class ShadowVpnService extends VpnService {
}
def destroy() {
killProcesses()
changeState(State.STOPPED)
EasyTracker.getTracker.sendEvent(TAG, "stop", getVersionName, 0L)
if (receiver != null) {
unregisterReceiver(receiver)
receiver = null
}
spawn {
killProcesses()
}
if (conn != null) {
conn.close()
conn = null
......
......@@ -443,15 +443,14 @@ class ShadowsocksService extends Service {
}
// reset NAT
Utils.runRootCommand(Utils.getIptables + " -t nat -F OUTPUT")
spawn {
killProcesses()
}
killProcesses()
super.onDestroy()
}
def killProcesses() {
Utils.runRootCommand(Utils.getIptables + " -t nat -F OUTPUT")
val sb = new StringBuilder
sb ++= "kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`" ++= "\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment