Revert "Refine #530"

This reverts commit 292f22cc86.
2016-06-17 17:58:58 +08:00
parent 292f22cc86
commit 797b3fda12
2 changed files with 1 additions and 6 deletions
@@ -62,6 +62,7 @@ trait ServiceBoundContext extends Context with IBinder.DeathRecipient {

      connection = new ShadowsocksServiceConnection()
      bindService(intent, connection, Context.BIND_AUTO_CREATE)
+      startService(intent)
    }
  }

@@ -43,7 +43,6 @@ 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

@@ -73,11 +72,6 @@ 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() {