summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2021-12-17 15:57:08 +0000
committercyberta <cyberta@riseup.net>2021-12-17 15:57:08 +0000
commit2d05fa3dd46f11536a1af2b9dae23c51d3510c98 (patch)
tree013f2cae41e7c0647048216d90901c476136908b
parent684963a35cf0ba6e68f52877c1411690f0ef5731 (diff)
parentf2e791de0219e9874ac1878de17ff814f308c8e5 (diff)
Merge branch 'notification_leds' into 'master'
don't show led colors for vpn stats notifications, use them when app updates are available Closes #9046 See merge request leap/bitmask_android!157
-rw-r--r--app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java1
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java
index aaf487aa..939ed852 100644
--- a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java
+++ b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java
@@ -111,6 +111,7 @@ public class DownloadNotificationManager {
NotificationManager.IMPORTANCE_LOW);
channel.setSound(null, null);
channel.setDescription(description);
+ channel.setLightColor(Color.BLUE);
// Register the channel with the system; you can't change the importance
// or other notification behaviors after this
notificationManager.createNotificationChannel(channel);
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java
index 667b8892..d2603533 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java
@@ -238,7 +238,6 @@ public class VpnNotificationManager {
channel.setDescription(context.getString(R.string.channel_description_status));
channel.enableLights(true);
- channel.setLightColor(Color.BLUE);
channel.setSound(null, null);
compatNotificationManager.createNotificationChannel(channel);
}