aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index b88ee7af2..ad45d8e9a 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -518,10 +518,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
case ACTION_CLEAR_NOTIFICATION:
mNotificationService.clear();
break;
- case ACTION_DISABLE_FOREGROUND:
- getPreferences().edit().putBoolean("keep_foreground_service", false).commit();
- toggleForegroundService();
- break;
case ACTION_TRY_AGAIN:
resetAllAttemptCounts(false);
interactive = true;
@@ -796,7 +792,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
public void toggleForegroundService() {
- if (getPreferences().getBoolean("keep_foreground_service", false)) {
+ if (Config.USE_ALWAYS_FOREGROUND) {
startForeground(NotificationService.FOREGROUND_NOTIFICATION_ID, this.mNotificationService.createForegroundNotification());
} else {
stopForeground(true);
@@ -2770,11 +2766,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
public boolean allowMessageCorrection() {
- return getPreferences().getBoolean("allow_message_correction", false);
+ return getPreferences().getBoolean("allow_message_correction", true);
}
public boolean sendChatStates() {
- return getPreferences().getBoolean("chat_states", false);
+ return getPreferences().getBoolean("chat_states", true);
}
public boolean saveEncryptedMessages() {
@@ -2786,7 +2782,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
public boolean indicateReceived() {
- return getPreferences().getBoolean("indicate_received", false);
+ return getPreferences().getBoolean("indicate_received", true);
}
public boolean useTorToConnect() {