Merge trz/rename into trz/rebase

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrService.java b/src/main/java/eu/siacs/conversations/crypto/OtrService.java
index c23a7fc8..fda8dce0 100644
--- a/src/main/java/eu/siacs/conversations/crypto/OtrService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrService.java
@@ -17,6 +17,7 @@ import org.json.JSONObject;
 import android.util.Log;
 
 import eu.siacs.conversations.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.services.XmppConnectionService;
@@ -188,7 +189,7 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
 			Jid jid = Jid.fromSessionID(session);
 			Conversation conversation = mXmppConnectionService.find(account,jid);
 			if (conversation != null && conversation.setOutgoingChatState(Config.DEFAULT_CHATSTATE)) {
-				if (mXmppConnectionService.sendChatStates()) {
+				if (ConversationsPlusPreferences.chatStates()) {
 					packet.addChild(ChatState.toElement(conversation.getOutgoingChatState()));
 				}
 			}