TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-16 16:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Give user the opportunity to chose no LED-notification.

Browse Source
This commit is contained in:
3xo 2014-03-04 11:05:56 +01:00 committed by Moxie Marlinspike
parent 574f33c92d
commit 339193af12
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/arrays.xml
View File

@ -82,6 +82,7 @@
<item>@string/preferences__cyan</item> <item>@string/preferences__cyan</item>
<item>@string/preferences__magenta</item> <item>@string/preferences__magenta</item>
<item>@string/preferences__white</item> <item>@string/preferences__white</item>
<item>@string/preferences__none</item>
</string-array> </string-array>
@ -93,6 +94,7 @@
<item>cyan</item> <item>cyan</item>
<item>magenta</item> <item>magenta</item>
<item>white</item> <item>white</item>
<item>none</item>
</string-array> </string-array>
<string-array name="pref_led_blink_pattern_entries"> <string-array name="pref_led_blink_pattern_entries">

1
res/values/strings.xml
View File

@ -693,6 +693,7 @@
<string name="preferences__cyan">Cyan</string> <string name="preferences__cyan">Cyan</string>
<string name="preferences__magenta">Magenta</string> <string name="preferences__magenta">Magenta</string>
<string name="preferences__white">White</string> <string name="preferences__white">White</string>
<string name="preferences__none">None</string>
<string name="preferences__fast">Fast</string> <string name="preferences__fast">Fast</string>
<string name="preferences__normal">Normal</string> <string name="preferences__normal">Normal</string>
<string name="preferences__slow">Slow</string> <string name="preferences__slow">Slow</string>

10
src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View File

@ -361,11 +361,15 @@ public class MessageNotifier {
builder.setSound(TextUtils.isEmpty(ringtone) || !signal ? null : Uri.parse(ringtone)); builder.setSound(TextUtils.isEmpty(ringtone) || !signal ? null : Uri.parse(ringtone));
if (signal && vibrate) if (signal && vibrate) {
builder.setDefaults(Notification.DEFAULT_VIBRATE); builder.setDefaults(Notification.DEFAULT_VIBRATE);
}
builder.setLights(Color.parseColor(ledColor), Integer.parseInt(blinkPatternArray[0]), if (!ledColor.equals("none")) {
Integer.parseInt(blinkPatternArray[1])); builder.setLights(Color.parseColor(ledColor),
Integer.parseInt(blinkPatternArray[0]),
Integer.parseInt(blinkPatternArray[1]));
}
} }
private static String[] parseBlinkPattern(String blinkPattern, String blinkPatternCustom) { private static String[] parseBlinkPattern(String blinkPattern, String blinkPatternCustom) {