refine VPN mode

This commit is contained in:
Max Lv
2014-09-02 10:02:08 +08:00
parent 382af46d91
commit acd89cc999
4 changed files with 0 additions and 12 deletions
@@ -919,7 +919,6 @@ class Shadowsocks
if (isVpnEnabled) {
val style = new Style.Builder().setBackgroundColorValue(Style.holoBlueLight).build()
val config = new Configuration.Builder().setDuration(Configuration.DURATION_LONG).build()
Crouton.makeText(Shadowsocks.this, R.string.vpn_status, style).setConfiguration(config).show()
changeSwitch(checked = false)
}
true
@@ -118,13 +118,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
def startVpn() {
val openIntent = new Intent(this, classOf[Shadowsocks])
openIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
val configIntent = PendingIntent.getActivity(this, 0, openIntent, 0)
val builder = new Builder()
builder
.setConfigureIntent(configIntent)
.setSession(config.profileName)
.setMtu(VPN_MTU)
.addAddress(PRIVATE_VLAN.format("1"), 24)
@@ -221,9 +216,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
def notifyAlert(title: String, info: String) {
val openIntent = new Intent(this, classOf[Shadowsocks])
openIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
val contentIntent = PendingIntent.getActivity(this, 0, openIntent, 0)
val builder = new NotificationCompat.Builder(this)
builder
.setSmallIcon(R.drawable.ic_stat_shadowsocks)
@@ -231,7 +223,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
.setTicker(title)
.setContentTitle(getString(R.string.app_name))
.setContentText(info)
.setContentIntent(contentIntent)
.setAutoCancel(true)
notificationManager.notify(1, builder.build)
}