Add realtime traffic in profiles selector

This commit is contained in:
Mygod
2015-11-21 16:04:55 +08:00
parent c08296890a
commit 407ba8beaa
10 changed files with 146 additions and 156 deletions
@@ -40,31 +40,22 @@
package com.github.shadowsocks
import android.app.Service
import android.content._
import android.content.Intent
import android.net.VpnService
import android.os._
import com.github.shadowsocks.aidl.IShadowsocksService
import com.github.shadowsocks.utils._
import android.os.{IBinder, Handler}
import com.github.shadowsocks.utils.ConfigUtils
class ShadowsocksRunnerService extends Service {
class ShadowsocksRunnerService extends Service with ServiceBoundContext {
val handler = new Handler()
val connection = new ServiceConnection {
override def onServiceConnected(name: ComponentName, service: IBinder) {
bgService = IShadowsocksService.Stub.asInterface(service)
handler.postDelayed(() => if (bgService != null) startBackgroundService(), 1000)
}
override def onServiceDisconnected(name: ComponentName) {
bgService = null
}
}
// Variables
var bgService: IShadowsocksService = _
override def onBind(intent: Intent): IBinder = {
null
}
override def onServiceConnected() {
handler.postDelayed(() => if (bgService != null) startBackgroundService(), 1000)
}
def startBackgroundService() {
if (ShadowsocksApplication.isVpnEnabled) {
val intent = VpnService.prepare(ShadowsocksRunnerService.this)
@@ -79,23 +70,6 @@ class ShadowsocksRunnerService extends Service {
stopSelf()
}
def attachService() {
if (bgService == null) {
val s = if (!ShadowsocksApplication.isVpnEnabled) classOf[ShadowsocksNatService] else classOf[ShadowsocksVpnService]
val intent = new Intent(this, s)
intent.setAction(Action.SERVICE)
bindService(intent, connection, Context.BIND_AUTO_CREATE)
startService(new Intent(this, s))
}
}
def deattachService() {
if (bgService != null) {
unbindService(connection)
bgService = null
}
}
override def onCreate() {
super.onCreate()
attachService()