diff options
| author | Christian S <christian@pix-art.de> | 2016-04-15 21:54:05 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-15 21:54:05 +0200 |
| commit | 26850fe48b1c772cb078276c3e8b4287689d17b6 (patch) | |
| tree | 4acc973003d039c1c2667dcbbf075b81c7c7836e /src/main/java/eu/siacs/conversations/services | |
| parent | 5f517a76a8247604b0a7eca15b4ed1d57e28e5df (diff) | |
added condition to show 'disable foreground service' button
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -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 a057fb029..c7036c98c 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -544,7 +544,7 @@ public class NotificationService { cancelIcon = R.drawable.ic_action_cancel; } mBuilder.setSmallIcon(R.drawable.ic_link_white_24dp); - if (Config.SHOW_DISABLE_FOREGROUND) { + if (Config.SHOW_DISABLE_FOREGROUND && !Config.USE_ALWAYS_FOREGROUND) { mBuilder.addAction(cancelIcon, mXmppConnectionService.getString(R.string.disable_foreground_service), createDisableForeground()); |