aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-11-08 21:28:00 +0100
committerChristian Schneppe <christian@pix-art.de>2016-11-08 21:28:00 +0100
commit0f31e4075fa0417366be5d0d5842c665b071c8b5 (patch)
tree21e0be000db721694dd8b9d328afb2ee14f33660
parent2dccfb6dc94fac1233fa2e02c2990efb699798c8 (diff)
fixed regression of showing delivery failed after receipt
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java3
1 files changed, 1 insertions, 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);