awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Also show errors for incoming emails (#2404)

Browse Source 
Needed for deltachat/deltachat-core-rust#3583. Before that PR, we never put errors on incoming messages, so this wasn't necessary.
This commit is contained in:
Hocuri
2022-10-28 12:18:00 +02:00
committed by GitHub
parent 8b3e251449
commit c95bfb544d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/b44t/messenger/DcMsg.java
+3 -1
View File
@@ -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;
src/org/thoughtcrime/securesms/ConversationUpdateItem.java
+2 -2
View File
@@ -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();
src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+1 -1
View File
@@ -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();