From c95bfb544d6309784390edd129cb702cb58ec1ef Mon Sep 17 00:00:00 2001 From: Hocuri Date: Fri, 28 Oct 2022 12:18:00 +0200 Subject: [PATCH] Also show errors for incoming emails (#2404) Needed for deltachat/deltachat-core-rust#3583. Before that PR, we never put errors on incoming messages, so this wasn't necessary. --- src/com/b44t/messenger/DcMsg.java | 4 +++- src/org/thoughtcrime/securesms/ConversationUpdateItem.java | 4 ++-- .../securesms/components/ConversationItemFooter.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/b44t/messenger/DcMsg.java b/src/com/b44t/messenger/DcMsg.java index 8be2823e1..57157294a 100644 --- a/src/com/b44t/messenger/DcMsg.java +++ b/src/com/b44t/messenger/DcMsg.java @@ -1,5 +1,7 @@ package com.b44t.messenger; +import android.text.TextUtils; + import org.json.JSONObject; import java.io.File; @@ -200,7 +202,7 @@ public class DcMsg { } public boolean isFailed() { - return getState() == DC_STATE_OUT_FAILED; + return (getState() == DC_STATE_OUT_FAILED) || (!TextUtils.isEmpty(getError())); } public boolean isPreparing() { return getState() == DC_STATE_OUT_PREPARING; diff --git a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java index 64111b8bb..8dda53010 100644 --- a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java +++ b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java @@ -83,8 +83,8 @@ public class ConversationUpdateItem extends BaseConversationItem bodyText.setText(messageRecord.getDisplayBody()); bodyText.setVisibility(VISIBLE); - if (!messageRecord.isOutgoing()) deliveryStatusView.setNone(); - else if (messageRecord.isFailed()) deliveryStatusView.setFailed(); + if (messageRecord.isFailed()) deliveryStatusView.setFailed(); + else if (!messageRecord.isOutgoing()) deliveryStatusView.setNone(); else if (messageRecord.isPreparing()) deliveryStatusView.setPreparing(); else if (messageRecord.isPending()) deliveryStatusView.setPending(); else deliveryStatusView.setNone(); diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java index e771a4c8a..b7f480cd0 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java +++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java @@ -92,10 +92,10 @@ public class ConversationItemFooter extends LinearLayout { boolean isDownloading = messageRecord.getDownloadState() == DcMsg.DC_DOWNLOAD_IN_PROGRESS; if (isDownloading) deliveryStatusView.setDownloading(); + else if (messageRecord.isFailed()) deliveryStatusView.setFailed(); else if (!messageRecord.isOutgoing()) deliveryStatusView.setNone(); else if (messageRecord.isRemoteRead()) deliveryStatusView.setRead(); else if (messageRecord.isDelivered()) deliveryStatusView.setSent(); - else if (messageRecord.isFailed()) deliveryStatusView.setFailed(); else if (messageRecord.isPreparing()) deliveryStatusView.setPreparing(); else deliveryStatusView.setPending();