aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-04-23 16:12:59 +0200
committerChristian S <christian@pix-art.de>2016-04-23 16:12:59 +0200
commit97173fd512bd3948f6bfd9b27ae7d103d50a4ee9 (patch)
tree0f2287259068b60fbe44245583fd265aad2cb1e4
parent6a6112daeb5677594ab047f6fa6fe843b1b49f0c (diff)
hide disable account via config switch
-rw-r--r--src/main/java/eu/siacs/conversations/services/NotificationService.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index c7036c98c..a5e622ddc 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -582,9 +582,11 @@ public class NotificationService {
mXmppConnectionService.getString(R.string.try_again),
createTryAgainIntent());
if (errors.size() == 1) {
- mBuilder.addAction(R.drawable.ic_block_white_24dp,
- mXmppConnectionService.getString(R.string.disable_account),
- createDisableAccountIntent(errors.get(0)));
+ if (Config.SHOW_DISABLE_FOREGROUND && !Config.USE_ALWAYS_FOREGROUND) {
+ mBuilder.addAction(R.drawable.ic_block_white_24dp,
+ mXmppConnectionService.getString(R.string.disable_account),
+ createDisableAccountIntent(errors.get(0)));
+ }
}
mBuilder.setOngoing(true);
//mBuilder.setLights(0xffffffff, 2000, 4000);