Commit fce0ffe5 authored by Max Lv's avatar Max Lv

Refine #530

parent 556d8d78
......@@ -62,7 +62,6 @@ trait ServiceBoundContext extends Context with IBinder.DeathRecipient {
connection = new ShadowsocksServiceConnection()
bindService(intent, connection, Context.BIND_AUTO_CREATE)
startService(intent)
}
}
......
......@@ -43,6 +43,7 @@ import android.app.Service
import android.content.Intent
import android.net.VpnService
import android.os.{IBinder, Handler}
import com.github.shadowsocks.utils.Action
import com.github.shadowsocks.utils.ConfigUtils
import com.github.shadowsocks.ShadowsocksApplication.app
......@@ -72,6 +73,11 @@ class ShadowsocksRunnerService extends Service with ServiceBoundContext {
override def onCreate() {
super.onCreate()
attachService()
val s = if (app.isNatEnabled) classOf[ShadowsocksNatService] else classOf[ShadowsocksVpnService]
val intent = new Intent(this, s)
intent.setAction(Action.SERVICE)
startService(intent)
}
override def onDestroy() {
......
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