summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-12-11 08:43:52 +0100
committercyBerta <cyberta@riseup.net>2018-12-11 08:43:52 +0100
commit3609af508119f4d27b148e6f6f296c112943eafe (patch)
tree6c13e386c27ed07b3120e6976f298c70486075ff /app/src/main/java
parent4cf63d32d8b8770d366f39cd08e7f00f6a420f2b (diff)
parentbb072ffab834d347946468b0cd3834ee22e9ff13 (diff)
Merge branch 'cyberta_master' into feature/gatewayselection
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java5
1 files changed, 3 insertions, 2 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;