diff options
author | lookshe <github@lookshe.org> | 2016-02-28 18:40:20 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-02-28 19:17:03 +0100 |
commit | 8fb6204288d55f8af16ae47e32fa6c049284cadd (patch) | |
tree | 8b5996b3a2dbedef00559cc351a89ade7cd006c3 /src/main/java/eu/siacs/conversations/parser | |
parent | bad156913643573ed72bc492734dc0f39a6e8cd8 (diff) |
Fixes FS#48 and FS#136trz/merge_1.10.0
- corrected preference "confirm_messages" to "confirm_messages_list"
- removed unused "heart message" garbage
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser')
-rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 6e07396e..22446453 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -3,6 +3,7 @@ package eu.siacs.conversations.parser; import android.util.Log; import android.util.Pair; +import de.tzur.conversations.Settings; import eu.siacs.conversations.crypto.PgpDecryptionService; import net.java.otr4j.session.Session; import net.java.otr4j.session.SessionStatus; @@ -427,7 +428,7 @@ public class MessageParser extends AbstractParser implements mXmppConnectionService.updateConversationUi(); } - if (ConversationsPlusPreferences.confirmMessages() && remoteMsgId != null && !isForwarded && !isTypeGroupChat) { + if (Settings.CONFIRM_MESSAGE_READ && remoteMsgId != null && !isForwarded && !isTypeGroupChat) { sendMessageReceipts(account, packet); } |