summaryrefslogtreecommitdiff
path: root/app
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
parent4cf63d32d8b8770d366f39cd08e7f00f6a420f2b (diff)
parentbb072ffab834d347946468b0cd3834ee22e9ff13 (diff)
Merge branch 'cyberta_master' into feature/gatewayselection
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java5
-rw-r--r--app/src/main/res/values/untranslatable.xml2
3 files changed, 6 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 21948eed..33f8baa1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
defaultConfig {
applicationId "se.leap.bitmaskclient"
- versionCode 135
- versionName "0.9.9RC1"
+ versionCode 136
+ versionName "0.9.9"
resValue "string", "app_name", appName
vectorDrawables.useSupportLibrary = true
buildConfigField 'boolean', 'openvpn3', 'false'
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 f1cc82ad..07cca36e 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>