diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 48102712..9eb0996f 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -44,7 +44,6 @@
后台服务已停止。
请检查你的网络状态后并重试。
停止服务
- 推荐通过通知栏关闭 VPN 服务
无法启动 VPN 服务:\"%s\"。看来和你的设备存在兼容性问题,请使用 Root 模式。
确定
端口号应大于1024
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 774a9a01..2a45cdbb 100755
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -57,7 +57,6 @@
Shadowsocks stopped.
Please check your network status and try again.
Stop the service
- Recommend to disable the VPN service through the notification bar.
Unable to start VPN service: "%s". It seems to be a compatibility issue with your device. Please consider using ROOT mode instead.
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index b0db7bf5..062742d9 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -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
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
index c239fbaf..a0944a16 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -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)
}