From 8833649c3468fce9cc40a0e94371049093c5dd7d Mon Sep 17 00:00:00 2001
From: cyBerta <richy@cyborgsociety.org>
Date: Thu, 5 Dec 2013 01:45:51 +0100
Subject: Show location in openvpn notification message (Feature #4665)

---
 res/values-cs/strings.xml               | 2 +-
 res/values-de/strings.xml               | 2 +-
 res/values-id/strings.xml               | 2 +-
 res/values-ja/strings.xml               | 2 +-
 res/values-ru/strings.xml               | 2 +-
 res/values-uk/strings.xml               | 2 +-
 res/values/strings.xml                  | 2 +-
 src/se/leap/openvpn/OpenVpnService.java | 5 ++++-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 37ae7f40..fc367db0 100755
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -235,7 +235,7 @@
   <string name="minidump_generated">OpenVPN neočekávaně havarovalo. Zvaž možnost použití volby poslat Minidump z hlavního menu</string>
   <string name="send_minidump">Poslat Minidump vývojáři</string>
   <string name="send_minidump_summary">Poslat ladící informace o poslední havárii vývojáři</string>
-  <string name="notifcation_title">OpenVPN - %s</string>
+  <string name="notifcation_title">Bitmask - %s</string>
   <string name="session_ipv4string">%1$s - %2$s</string>
   <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
   <string name="state_connecting">Připojuji se</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index df50b594..c99314f4 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -235,7 +235,7 @@
   <string name="minidump_generated">Der OpenVPN Prozess ist unerwartet abgestürzt. Bitte erwägen Sie die Option \"Minidump senden\" im Hauptmenü</string>
   <string name="send_minidump">Minidump an Entwickler senden</string>
   <string name="send_minidump_summary">Sendet Debugging Informationen des letzten Absturzes an den Entwickler</string>
-  <string name="notifcation_title">OpenVPN - %s</string>
+  <string name="notifcation_title">Bitmask - %s</string>
   <string name="session_ipv4string">%1$s - %2$s</string>
   <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
   <string name="state_connecting">Verbinde</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 0166b7ea..2851a17b 100755
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -235,7 +235,7 @@
   <string name="minidump_generated">OpenVPN crash tak terduga. Silakan mempertimbangkan mengirim menggunakan pilihan Minidump di Menu Utama</string>
   <string name="send_minidump">Mengirim MiniDump untuk pengembang</string>
   <string name="send_minidump_summary">Kirim informasi kesalahan tentang kegagalan aplikasi yang terakhir ke pengembang</string>
-  <string name="notifcation_title">OpenVPN - %s</string>
+  <string name="notifcation_title">Bitmask - %s</string>
   <string name="session_ipv4string">%1$ s - %2$ s</string>
   <string name="session_ipv6string">%1$ s - %3$ s, %2$ s</string>
   <string name="state_connecting">Menghubungkan</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index db7602f7..b7885861 100755
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -274,7 +274,7 @@ TCP keepaliveと長いタイムアウト時間は動作しますが、TCP over T
   <string name="minidump_generated">OpenVPN は予期せず終了しました。メイン メニューでミニダンプの送信オプションを検討してください。</string>
   <string name="send_minidump">ミニダンプを開発者に送信</string>
   <string name="send_minidump_summary">最後にクラッシュした時のデバッグ情報を作者に送信します。</string>
-  <string name="notifcation_title">OpenVPN - %s</string>
+  <string name="notifcation_title">Bitmask - %s</string>
   <string name="session_ipv4string">%1$s - %2$s</string>
   <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
   <string name="state_connecting">接続中</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1d3c10a3..0bd87cd0 100755
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -234,7 +234,7 @@
   <string name="minidump_generated">OpenVPN завершилась неожиданно. Пожалуйста, посмотрите опцию \"Отправить Minidump\" в главном меню</string>
   <string name="send_minidump">Отправить Minidump разработчику</string>
   <string name="send_minidump_summary">Отправка отладочной информации разработчику о последнем неудачном завершении</string>
-  <string name="notifcation_title">OpenVPN - %s</string>
+  <string name="notifcation_title">Bitmask - %s</string>
   <string name="session_ipv4string">%1$s - %2$s</string>
   <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
   <string name="state_connecting">Подключение</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 14d9ce90..f055e913 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -235,7 +235,7 @@
   <string name="minidump_generated">OpenVPN впав несподівано. Будь ласка, розгляньте використання параметру \"Надіслати Мінідамп\" в головному меню</string>
   <string name="send_minidump">Надіслати мінідамп розробнику</string>
   <string name="send_minidump_summary">Надіслати налагоджувальну інформацію про останній збій розробнику</string>
-  <string name="notifcation_title">OpenVPN - %s</string>
+  <string name="notifcation_title">Bitmask - %s</string>
   <string name="session_ipv4string">%1$s - %2$s</string>
   <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
   <string name="state_connecting">Підключення</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2598d452..28d159b0 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -239,7 +239,7 @@
     <string name="minidump_generated">OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu</string>
     <string name="send_minidump">Send Minidump to developer</string>
     <string name="send_minidump_summary">Send debugging information about last crash to developer</string>
-    <string name="notifcation_title">OpenVPN - %s</string>
+    <string name="notifcation_title">Bitmask - %s</string>
     <string name="session_ipv4string">%1$s - %2$s</string>
     <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
     <string name="state_connecting">Connecting</string>
diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java
index 69dd56f4..f5b932f2 100644
--- a/src/se/leap/openvpn/OpenVpnService.java
+++ b/src/se/leap/openvpn/OpenVpnService.java
@@ -114,7 +114,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 		
 		android.app.Notification.Builder nbuilder = new Notification.Builder(this);
 
-		nbuilder.setContentTitle(getString(R.string.notifcation_title,mProfile.mName));
+		nbuilder.setContentTitle(getString(R.string.notifcation_title,mProfile.mLocation));
 		nbuilder.setContentText(msg);
 		nbuilder.setOnlyAlertOnce(true);
 		nbuilder.setOngoing(persistant);
@@ -481,6 +481,9 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 			boolean persist = false;
 			if (("NOPROCESS".equals(state) ) || ("EXITING").equals(state)){
 				showNotification(state, getString(R.string.eip_state_not_connected), ticker, false, 0, persist);
+			}
+			else if (state.equals("GET_CONFIG")){
+				
 			}
 			else{
 				persist = true;
-- 
cgit v1.2.3