From 3f916e5701401edf39fee3996eeb3710c906ea39 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 16 Oct 2013 10:35:11 +0800
Subject: [PATCH] show profile name on notification bar

---
 src/main/res/values/strings.xml                                | 2 +-
 src/main/scala/com/github/shadowsocks/ShadowVpnService.scala   | 2 +-
 src/main/scala/com/github/shadowsocks/ShadowsocksService.scala | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5a22d336..07199492 100755
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -47,7 +47,7 @@
 
   <!-- notification category -->
   <string name="forward_success">Shadowsocks started.</string>
-  <string name="service_running">Running in the background.</string>
+  <string name="service_running">Connected to Profile %s.</string>
   <string name="service_status" formatted="false">Current Speed: %d KB/s</string>
   <string name="forward_fail">Shadowsocks failed to start.</string>
   <string name="service_stopped">Shadowsocks stopped.</string>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
index 32e8e55d..58c26992 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
@@ -256,7 +256,7 @@ class ShadowVpnService extends VpnService {
 
     val builder = new Builder()
     builder
-      .setSession(getString(R.string.app_name))
+      .setSession(config.profileName)
       .setMtu(VPN_MTU)
       .addAddress(PRIVATE_VLAN.format("1"), 24)
       .addDnsServer("8.8.8.8")
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
index c2eb51a2..967dd14e 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
@@ -256,7 +256,7 @@ class ShadowsocksService extends Service {
 
       if (resolved && handleConnection) {
         notifyForegroundAlert(getString(R.string.forward_success),
-          getString(R.string.service_running))
+          getString(R.string.service_running).format(config.profileName))
         handler.sendEmptyMessageDelayed(MSG_CONNECT_SUCCESS, 500)
       } else {
         notifyAlert(getString(R.string.forward_fail), getString(R.string.service_failed))