From 339193af12fc81946eda4baba1877e5eace80262 Mon Sep 17 00:00:00 2001 From: 3xo Date: Tue, 4 Mar 2014 11:05:56 +0100 Subject: [PATCH] Give user the opportunity to chose no LED-notification. --- res/values/arrays.xml | 2 ++ res/values/strings.xml | 1 + .../securesms/notifications/MessageNotifier.java | 10 +++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 8ea699d926..06901308bb 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -82,6 +82,7 @@ @string/preferences__cyan @string/preferences__magenta @string/preferences__white + @string/preferences__none @@ -93,6 +94,7 @@ cyan magenta white + none diff --git a/res/values/strings.xml b/res/values/strings.xml index 5e6c9894b7..33076bc9f0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -693,6 +693,7 @@ Cyan Magenta White + None Fast Normal Slow diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java index 90bba1ffb5..f0a8e86f98 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -361,11 +361,15 @@ public class MessageNotifier { builder.setSound(TextUtils.isEmpty(ringtone) || !signal ? null : Uri.parse(ringtone)); - if (signal && vibrate) + if (signal && vibrate) { builder.setDefaults(Notification.DEFAULT_VIBRATE); + } - builder.setLights(Color.parseColor(ledColor), Integer.parseInt(blinkPatternArray[0]), - Integer.parseInt(blinkPatternArray[1])); + if (!ledColor.equals("none")) { + builder.setLights(Color.parseColor(ledColor), + Integer.parseInt(blinkPatternArray[0]), + Integer.parseInt(blinkPatternArray[1])); + } } private static String[] parseBlinkPattern(String blinkPattern, String blinkPatternCustom) {