From bd2fc82360c2a2fbd5e92194074104d465b8bf19 Mon Sep 17 00:00:00 2001 From: Christian Ascheberg Date: Thu, 1 Sep 2016 21:46:20 +0200 Subject: [PATCH] always set LED notification Closes #5654 // FREEBIE --- .../AbstractNotificationBuilder.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java index 1bd3c1558d..946430b78f 100644 --- a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java @@ -27,6 +27,8 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui this.context = context; this.privacy = privacy; + + setLed(); } protected CharSequence getStyledMessage(@NonNull Recipient recipient, @Nullable CharSequence message) { @@ -39,12 +41,8 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui } public void setAlarms(@Nullable Uri ringtone, RecipientPreferenceDatabase.VibrateState vibrate) { - String defaultRingtoneName = TextSecurePreferences.getNotificationRingtone(context); - boolean defaultVibrate = TextSecurePreferences.isNotificationVibrateEnabled(context); - String ledColor = TextSecurePreferences.getNotificationLedColor(context); - String ledBlinkPattern = TextSecurePreferences.getNotificationLedPattern(context); - String ledBlinkPatternCustom = TextSecurePreferences.getNotificationLedPatternCustom(context); - String[] blinkPatternArray = parseBlinkPattern(ledBlinkPattern, ledBlinkPatternCustom); + String defaultRingtoneName = TextSecurePreferences.getNotificationRingtone(context); + boolean defaultVibrate = TextSecurePreferences.isNotificationVibrateEnabled(context); if (ringtone != null) setSound(ringtone); else if (!TextUtils.isEmpty(defaultRingtoneName)) setSound(Uri.parse(defaultRingtoneName)); @@ -54,8 +52,16 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui { setDefaults(Notification.DEFAULT_VIBRATE); } + } + + private void setLed() { + String ledColor = TextSecurePreferences.getNotificationLedColor(context); + String ledBlinkPattern = TextSecurePreferences.getNotificationLedPattern(context); + String ledBlinkPatternCustom = TextSecurePreferences.getNotificationLedPatternCustom(context); if (!ledColor.equals("none")) { + String[] blinkPatternArray = parseBlinkPattern(ledBlinkPattern, ledBlinkPatternCustom); + setLights(Color.parseColor(ledColor), Integer.parseInt(blinkPatternArray[0]), Integer.parseInt(blinkPatternArray[1]));