diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-11-07 21:57:08 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-11-07 21:57:08 +0100 |
| commit | 7978fd768e07725da51ad2d7f84847af3b7badc4 (patch) | |
| tree | 024a1b04f5593537bad575098ea9a64bf8fe8842 /src/main | |
| parent | 9edbddd7e1f9601f8b0cdd4024512988e74cdeee (diff) | |
fixed regression of showing delivery failed after receipt
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 15ad7baa..12f20d03 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2980,8 +2980,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); |