narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed regression of showing delivery failed after receipt

Browse source
This commit is contained in:
Daniel Gultsch 2016-11-07 21:57:08 +01:00
parent 9edbddd7e1
commit 7978fd768e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -2980,8 +2980,7 @@ public class XmppConnectionService extends Service {
public void markMessage(Message message, int status, String errorMessage) { public void markMessage(Message message, int status, String errorMessage) {
if (status == Message.STATUS_SEND_FAILED if (status == Message.STATUS_SEND_FAILED
&& (message.getStatus() == Message.STATUS_SEND_RECEIVED || message && (message.getStatus() == Message.STATUS_SEND_RECEIVED || message
.getStatus() == Message.STATUS_SEND_DISPLAYED) .getStatus() == Message.STATUS_SEND_DISPLAYED)) {
&& errorMessage == null) {
return; return;
} }
message.setErrorMessage(errorMessage); message.setErrorMessage(errorMessage);