diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:51:21 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-04-06 22:51:21 +0200 |
commit | 4ace80d39ade18934d310ba37559c9c7ec8004dd (patch) | |
tree | d65d00e0ea19af3af2e569be15121a014bec39a1 /src/main/java/eu/siacs/conversations/services/NotificationService.java | |
parent | b55ce9ee90533eb7762ad11ea7b22193cbd94ed5 (diff) | |
parent | 18548e9ebb246071f0bc46ca3bb07a300176cf24 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/NotificationService.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index c54e2f31..c2e1b098 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -537,7 +537,7 @@ public class NotificationService { errors.add(account); } } - if (mXmppConnectionService.getPreferences().getBoolean("keep_foreground_service", false)) { + if (ConversationsPlusPreferences.keepForegroundService()) { notificationManager.notify(FOREGROUND_NOTIFICATION_ID, createForegroundNotification()); } final NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService); |