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

always set LED notification

Browse Source 
Closes #5654
// FREEBIE
This commit is contained in:
Christian Ascheberg
2016-09-01 21:46:20 +02:00
committed by Moxie Marlinspike
parent e1b24ab878
commit bd2fc82360
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
View File

@@ -27,6 +27,8 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
this.context = context; this.context = context;
this.privacy = privacy; this.privacy = privacy;
setLed();
} }
protected CharSequence getStyledMessage(@NonNull Recipient recipient, @Nullable CharSequence message) { 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) { public void setAlarms(@Nullable Uri ringtone, RecipientPreferenceDatabase.VibrateState vibrate) {
String defaultRingtoneName = TextSecurePreferences.getNotificationRingtone(context); String defaultRingtoneName = TextSecurePreferences.getNotificationRingtone(context);
boolean defaultVibrate = TextSecurePreferences.isNotificationVibrateEnabled(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);
if (ringtone != null) setSound(ringtone); if (ringtone != null) setSound(ringtone);
else if (!TextUtils.isEmpty(defaultRingtoneName)) setSound(Uri.parse(defaultRingtoneName)); else if (!TextUtils.isEmpty(defaultRingtoneName)) setSound(Uri.parse(defaultRingtoneName));
@@ -54,8 +52,16 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
{ {
setDefaults(Notification.DEFAULT_VIBRATE); 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")) { if (!ledColor.equals("none")) {
String[] blinkPatternArray = parseBlinkPattern(ledBlinkPattern, ledBlinkPatternCustom);
setLights(Color.parseColor(ledColor), setLights(Color.parseColor(ledColor),
Integer.parseInt(blinkPatternArray[0]), Integer.parseInt(blinkPatternArray[0]),
Integer.parseInt(blinkPatternArray[1])); Integer.parseInt(blinkPatternArray[1]));