From c5d5be2d6dfb3cd98758cfbffebf80435428277d Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 25 Oct 2018 23:53:01 +0200
Subject: fix notification title of the custom branded version

---
 app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java | 5 +++--
 app/src/main/res/values/untranslatable.xml                          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java b/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
index f4c7f682..503ba536 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
@@ -127,10 +127,11 @@ public class VpnNotificationManager {
         NotificationCompat.Action.Builder actionBuilder = new NotificationCompat.Action.
                 Builder(R.drawable.ic_menu_close_clear_cancel, cancelString, getDisconnectIntent());
         String title;
+        String appName = context.getString(R.string.app_name);
         if (isEmpty(profileName)) {
-            title = context.getString(R.string.app_name);
+            title = appName;
        } else {
-            title = context.getString(R.string.notifcation_title_bitmask, profileName);
+            title = context.getString(R.string.notifcation_title_bitmask, appName, profileName);
         }
 
         PendingIntent contentIntent;
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 2e91366a..7270acf6 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="notifcation_title_bitmask">Bitmask - %s</string>
+    <string name="notifcation_title_bitmask">%s - %s</string>
     <string name="copyright_leapgui" translatable="false">Copyright 2012-2018\nLEAP Encryption Access Project &lt;info@leap.se></string>
     <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
 	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
-- 
cgit v1.2.3