From c7bbfaf0616576837d8e9d3e132d798d7a2dbb82 Mon Sep 17 00:00:00 2001 From: Marcin Mielniczuk Date: Tue, 1 Oct 2019 21:42:05 +0200 Subject: [PATCH] Use a more meaningful name for old status (#3552) --- .../siacs/conversations/services/XmppConnectionService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index a5348e4e3..cfce84a2c 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -3776,11 +3776,11 @@ public class XmppConnectionService extends Service { public void markMessage(Message message, int status, String errorMessage) { - final int c = message.getStatus(); - if (status == Message.STATUS_SEND_FAILED && (c == Message.STATUS_SEND_RECEIVED || c == Message.STATUS_SEND_DISPLAYED)) { + final int oldStatus = message.getStatus(); + if (status == Message.STATUS_SEND_FAILED && (oldStatus == Message.STATUS_SEND_RECEIVED || oldStatus == Message.STATUS_SEND_DISPLAYED)) { return; } - if (status == Message.STATUS_SEND_RECEIVED && c == Message.STATUS_SEND_DISPLAYED) { + if (status == Message.STATUS_SEND_RECEIVED && oldStatus == Message.STATUS_SEND_DISPLAYED) { return; } message.setErrorMessage(errorMessage);