Commit c8f68e1a authored by Max Lv's avatar Max Lv

refine context clean up

parent d0ca6667
...@@ -60,6 +60,7 @@ import java.util.{TimerTask, Timer} ...@@ -60,6 +60,7 @@ import java.util.{TimerTask, Timer}
import android.net.TrafficStats import android.net.TrafficStats
import android.graphics._ import android.graphics._
import scala.Some import scala.Some
import scala.concurrent.ops._
case class TrafficStat(tx: Long, rx: Long, timestamp: Long) case class TrafficStat(tx: Long, rx: Long, timestamp: Long)
...@@ -169,8 +170,7 @@ class ShadowsocksService extends Service { ...@@ -169,8 +170,7 @@ class ShadowsocksService extends Service {
} }
def startShadowsocksDaemon() { def startShadowsocksDaemon() {
new Thread { spawn {
override def run() {
val cmd: String = (BASE + val cmd: String = (BASE +
"shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " + "shadowsocks -s \"%s\" -p \"%d\" -l \"%d\" -k \"%s\" -m \"%s\" -f " +
BASE + BASE +
...@@ -180,7 +180,6 @@ class ShadowsocksService extends Service { ...@@ -180,7 +180,6 @@ class ShadowsocksService extends Service {
if (BuildConfig.DEBUG) Log.d(TAG, cmd) if (BuildConfig.DEBUG) Log.d(TAG, cmd)
System.exec(cmd) System.exec(cmd)
} }
}.start()
} }
def startDnsDaemon() { def startDnsDaemon() {
...@@ -211,9 +210,8 @@ class ShadowsocksService extends Service { ...@@ -211,9 +210,8 @@ class ShadowsocksService extends Service {
config = Extra.get(intent) config = Extra.get(intent)
new Thread(new Runnable {
def run() {
spawn {
killProcesses() killProcesses()
var resolved: Boolean = false var resolved: Boolean = false
...@@ -242,7 +240,6 @@ class ShadowsocksService extends Service { ...@@ -242,7 +240,6 @@ class ShadowsocksService extends Service {
} }
handler.sendEmptyMessageDelayed(MSG_CONNECT_FINISH, 500) handler.sendEmptyMessageDelayed(MSG_CONNECT_FINISH, 500)
} }
}).start()
} }
def startRedsocksDaemon() { def startRedsocksDaemon() {
...@@ -433,32 +430,36 @@ class ShadowsocksService extends Service { ...@@ -433,32 +430,36 @@ class ShadowsocksService extends Service {
/** Called when the activity is closed. */ /** Called when the activity is closed. */
override def onDestroy() { override def onDestroy() {
// clean up context
changeState(State.STOPPED) changeState(State.STOPPED)
timer.cancel() timer.cancel()
EasyTracker.getTracker.setStartSession(false) EasyTracker.getTracker.setStartSession(false)
EasyTracker.getTracker.sendEvent(TAG, "stop", getVersionName, 0L) EasyTracker.getTracker.sendEvent(TAG, "stop", getVersionName, 0L)
stopForegroundCompat(1) stopForegroundCompat(1)
new Thread {
override def run() {
killProcesses()
}
}.start()
if (receiver != null) { if (receiver != null) {
unregisterReceiver(receiver) unregisterReceiver(receiver)
receiver = null receiver = null
} }
// reset NAT
Utils.runRootCommand(Utils.getIptables + " -t nat -F OUTPUT")
spawn {
killProcesses()
}
super.onDestroy() super.onDestroy()
} }
def killProcesses() { def killProcesses() {
Utils.runRootCommand(Utils.getIptables + " -t nat -F OUTPUT")
val sb = new StringBuilder val sb = new StringBuilder
sb ++= "kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`" ++= "\n" sb ++= "kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`" ++= "\n"
sb ++= "killall -9 redsocks" ++= "\n" sb ++= "killall -9 redsocks" ++= "\n"
Utils.runRootCommand(sb.toString()) Utils.runRootCommand(sb.toString())
sb.clear() sb.clear()
if (!waitForProcess("pdnsd")) { if (!waitForProcess("pdnsd")) {
sb ++= "kill -9 `cat /data/data/com.github.shadowsocks/pdnsd.pid`" ++= "\n" sb ++= "kill -9 `cat /data/data/com.github.shadowsocks/pdnsd.pid`" ++= "\n"
sb ++= "killall -9 pdnsd" ++= "\n" sb ++= "killall -9 pdnsd" ++= "\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