diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:27:01 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:27:01 +0200 |
| commit | 52fec558adb2b4d9bb3df314fd919570e7198e26 (patch) | |
| tree | 524f316aaddd19363ef42be2cec660f4a50e56cd /src/main/java/eu/siacs/conversations/services/NotificationService.java | |
| parent | 61149411c5141f2f9afe9b050ddce28c9d3df202 (diff) | |
| parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/NotificationService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 5ae7e9f1..12c11dd0 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -522,11 +522,9 @@ public class NotificationService { cancelIcon = R.drawable.ic_action_cancel; } mBuilder.setSmallIcon(R.drawable.ic_link_white_24dp); - if (Config.SHOW_DISABLE_FOREGROUND) { - mBuilder.addAction(cancelIcon, - mXmppConnectionService.getString(R.string.disable_foreground_service), - createDisableForeground()); - } + mBuilder.addAction(cancelIcon, + mXmppConnectionService.getString(R.string.disable_foreground_service), + createDisableForeground()); return mBuilder.build(); } |