changed received and read confirmation setting to one list and put it to settings class

1 files changed, 1 insertions, 9 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 0e531d57..fc670efd 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2107,14 +2107,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return getPreferences().getBoolean("force_encryption", false);
 	}
 
-	public boolean confirmMessages() {
-		return getPreferences().getBoolean("confirm_messages", true);
-	}
-
-    public boolean confirmMessagesRead() {
-        return getPreferences().getBoolean("confirm_read_message", true);
-    }
-
 	public boolean sendChatStates() {
 		return getPreferences().getBoolean("chat_states", false);
 	}
@@ -2191,7 +2183,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void sendReadMarker(final Conversation conversation) {
 		final Message markable = conversation.getLatestMarkableMessage();
 		this.markRead(conversation);
-		if (confirmMessagesRead() && markable != null && markable.getRemoteMsgId() != null) {
+		if (Settings.CONFIRM_MESSAGE_READ && markable != null && markable.getRemoteMsgId() != null) {
 			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString());
 			Account account = conversation.getAccount();
 			final Jid to = markable.getCounterpart();