1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 243b9b4f5..6aea5c8cf 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -685,7 +685,7 @@ public class XmppConnectionService extends Service {
                     sendReadMarker(c);
                     break;
                 case AudioManager.RINGER_MODE_CHANGED_ACTION:
-                    if (xaOnSilentMode()) {
+                    if (dndOnSilentMode()) {
                         refreshAllPresences();
                     }
                     break;
@@ -870,8 +870,8 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    private boolean xaOnSilentMode() {
-        return getPreferences().getBoolean("xa_on_silent_mode", false);
+    private boolean dndOnSilentMode() {
+        return getPreferences().getBoolean(SettingsActivity.DND_ON_SILENT_MODE, getResources().getBoolean(R.bool.dnd_on_silent_mode));
     }
 
     private boolean manuallyChangePresence() {
@@ -879,7 +879,7 @@ public class XmppConnectionService extends Service {
     }
 
     private boolean treatVibrateAsSilent() {
-        return getPreferences().getBoolean(SettingsActivity.TREAT_VIBRATE_AS_SILENT, false);
+        return getPreferences().getBoolean(SettingsActivity.TREAT_VIBRATE_AS_SILENT, getResources().getBoolean(R.bool.treat_vibrate_as_silent));
     }
 
     private boolean awayWhenScreenOff() {
@@ -943,8 +943,8 @@ public class XmppConnectionService extends Service {
     }
 
     private Presence.Status getTargetPresence() {
-        if (xaOnSilentMode() && isPhoneSilenced()) {
-            return Presence.Status.XA;
+        if (dndOnSilentMode() && isPhoneSilenced()) {
+            return Presence.Status.DND;
         } else if (awayWhenScreenOff() && !isInteractive()) {
             return Presence.Status.AWAY;
         } else {