aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-18 09:38:55 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-18 09:38:55 +0200
commit073813d192067a2b91c50d2108a0cb98fc865ab4 (patch)
treec0a8170ca156b6049322b25aed7e91f0ead38633 /src/main/java/de/thedevstack/conversationsplus
parent22394cfaf07d32e803bbd8c1688f514c71cd0bba (diff)
Related to FS#199: Removed unnecessary build configuration variable to hide disable button on foreground service notification
Diffstat (limited to '')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/Config.java1
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java8
2 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/Config.java b/src/main/java/de/thedevstack/conversationsplus/Config.java
index b77489e9..45347648 100644
--- a/src/main/java/de/thedevstack/conversationsplus/Config.java
+++ b/src/main/java/de/thedevstack/conversationsplus/Config.java
@@ -47,7 +47,6 @@ public final class Config {
public static final boolean ALLOW_NON_TLS_CONNECTIONS = false; //very dangerous. you should have a good reason to set this to true
public static final boolean HIDE_MESSAGE_TEXT_IN_NOTIFICATION = false;
public static final boolean SHOW_CONNECTED_ACCOUNTS = false; //show number of connected accounts in foreground notification
- public static final boolean SHOW_DISABLE_FOREGROUND = true; //if set to true the foreground notification has a button to disable it
public static final boolean LEGACY_NAMESPACE_HTTP_UPLOAD = false;
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
index b06dd95c..a3142df4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/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();
}