Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
bitmask_android
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
73
Issues
73
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
leap
bitmask_android
Commits
3609af50
Commit
3609af50
authored
Dec 11, 2018
by
cyberta
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cyberta_master' into feature/gatewayselection
parents
4cf63d32
bb072ffa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
CHANGELOG
CHANGELOG
+9
-0
app/build.gradle
app/build.gradle
+2
-2
app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
...in/java/se/leap/bitmaskclient/VpnNotificationManager.java
+3
-2
app/src/main/res/values/untranslatable.xml
app/src/main/res/values/untranslatable.xml
+1
-1
No files found.
CHANGELOG
View file @
3609af50
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+
...
...
app/build.gradle
View file @
3609af50
...
...
@@ -16,8 +16,8 @@ android {
defaultConfig
{
applicationId
"se.leap.bitmaskclient"
versionCode
13
5
versionName
"0.9.9
RC1
"
versionCode
13
6
versionName
"0.9.9"
resValue
"string"
,
"app_name"
,
appName
vectorDrawables
.
useSupportLibrary
=
true
buildConfigField
'boolean'
,
'openvpn3'
,
'false'
...
...
app/src/main/java/se/leap/bitmaskclient/VpnNotificationManager.java
View file @
3609af50
...
...
@@ -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
;
...
...
app/src/main/res/values/untranslatable.xml
View file @
3609af50
<?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
<
info@leap.se>
</string>
<string
name=
"opevpn_copyright"
translatable=
"false"
>
Copyright © 2002–2010 OpenVPN Technologies, Inc.
<
sales@openvpn.net>\n
"OpenVPN" is a trademark of OpenVPN Technologies, Inc.
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment