Revert "improved compatibility with muc components that change the message id"

Daniel Gultsch created 10 years ago

This reverts commit df86b0fc47cb7af8e97826f97d0e202405cff414.

Change summary

src/main/java/eu/siacs/conversations/parser/MessageParser.java | 5 +--
1 file changed, 2 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -311,10 +311,9 @@ public class MessageParser extends AbstractParser implements
 					status = Message.STATUS_SEND_RECEIVED;
 					if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) {
 						return;
-					} else {
-						Message message = conversation.findSentMessageWithBody(body);
+					} else if (remoteMsgId == null) {
+						Message message = conversation.findSentMessageWithBody(packet.getBody());
 						if (message != null) {
-							message.setRemoteMsgId(remoteMsgId);
 							mXmppConnectionService.markMessage(message, status);
 							return;
 						}