Commit 3609af50 authored by cyberta's avatar cyberta

Merge branch 'cyberta_master' into feature/gatewayselection

parents 4cf63d32 bb072ffa
0.9.9 - custom branded apps
Features:
- allows Providers to create an own version of Bitmask without knowing much about Android development
-> Credits goes to janak, a GSOC 2018 participant for LEAP!
- direct link to Android's VPN settings to allow always-on vpn
- updated crypto libraries
- new translations
- bugfixes
0.9.8 - the UI overhaul
Bugs:
- fixes notification channel bug on Android 8+
......
......@@ -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'
......
......@@ -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;
......
<?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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment