From 7e2d9a06d8c9e6536c388faad0e526a0f1b5d6cd Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Fri, 24 Apr 2020 09:40:22 +0900 Subject: Handle delivered messages as completed messages Delivered messages could be forwarded and sent time can be shown on MessageDetailsDialog. Test: Manual Signed-off-by: Taesu Lee Change-Id: I6e24bdfe6a037ab588914327dbd8abf3f30512ea --- .../android/messaging/datamodel/data/ConversationMessageData.java | 8 +++++--- .../messaging/ui/conversation/ConversationMessageView.java | 1 + src/com/android/messaging/widget/WidgetConversationService.java | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/messaging/datamodel/data/ConversationMessageData.java b/src/com/android/messaging/datamodel/data/ConversationMessageData.java index 19e1b97..2a85277 100644 --- a/src/com/android/messaging/datamodel/data/ConversationMessageData.java +++ b/src/com/android/messaging/datamodel/data/ConversationMessageData.java @@ -523,7 +523,8 @@ public class ConversationMessageData { } public boolean getIsSendComplete() { - return mStatus == MessageData.BUGLE_STATUS_OUTGOING_COMPLETE; + return (mStatus == MessageData.BUGLE_STATUS_OUTGOING_COMPLETE + || mStatus == MessageData.BUGLE_STATUS_OUTGOING_DELIVERED); } public String getSenderFullName() { @@ -575,8 +576,9 @@ public class ConversationMessageData { public boolean getCanForwardMessage() { // Even for outgoing messages, we only allow forwarding if the message has finished sending // as media often has issues when send isn't complete - return (mStatus == MessageData.BUGLE_STATUS_OUTGOING_COMPLETE || - mStatus == MessageData.BUGLE_STATUS_INCOMING_COMPLETE); + return (mStatus == MessageData.BUGLE_STATUS_OUTGOING_COMPLETE + || mStatus == MessageData.BUGLE_STATUS_OUTGOING_DELIVERED + || mStatus == MessageData.BUGLE_STATUS_INCOMING_COMPLETE); } public boolean getCanCopyMessageToClipboard() { diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageView.java b/src/com/android/messaging/ui/conversation/ConversationMessageView.java index 6b81398..e697899 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageView.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageView.java @@ -377,6 +377,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick // FALL THROUGH HERE case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE: + case MessageData.BUGLE_STATUS_OUTGOING_DELIVERED: case MessageData.BUGLE_STATUS_INCOMING_COMPLETE: default: if (!mData.getCanClusterWithNextMessage()) { diff --git a/src/com/android/messaging/widget/WidgetConversationService.java b/src/com/android/messaging/widget/WidgetConversationService.java index 4fd3934..5b8587b 100644 --- a/src/com/android/messaging/widget/WidgetConversationService.java +++ b/src/com/android/messaging/widget/WidgetConversationService.java @@ -330,6 +330,7 @@ public class WidgetConversationService extends RemoteViewsService { // FALL THROUGH HERE case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE: + case MessageData.BUGLE_STATUS_OUTGOING_DELIVERED: case MessageData.BUGLE_STATUS_INCOMING_COMPLETE: default: if (!message.getCanClusterWithNextMessage()) { -- cgit v1.2.3