From 0f31e4075fa0417366be5d0d5842c665b071c8b5 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 8 Nov 2016 21:28:00 +0100
Subject: fixed regression of showing delivery failed after receipt

---
 src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 15f76b12f..9a9eca3b7 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3118,8 +3118,7 @@ public class XmppConnectionService extends Service {
     public void markMessage(Message message, int status, String errorMessage) {
 		if (status == Message.STATUS_SEND_FAILED
 				&& (message.getStatus() == Message.STATUS_SEND_RECEIVED || message
-                .getStatus() == Message.STATUS_SEND_DISPLAYED)
-                && errorMessage == null) {
+                .getStatus() == Message.STATUS_SEND_DISPLAYED)) {
 			return;
 		}
         message.setErrorMessage(errorMessage);
-- 
cgit v1.2.3