diff options
| author | Taesu Lee <taesu82.lee@samsung.com> | 2020-04-24 09:40:22 +0900 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-05-24 20:13:50 +0300 |
| commit | 7e2d9a06d8c9e6536c388faad0e526a0f1b5d6cd (patch) | |
| tree | f7f3072d2a01223056b32183290d7af164b65df4 | |
| parent | d07c5ef141187fb88b97f9fbb8c3293e6f40c005 (diff) | |
| download | packages_apps_Messaging-7e2d9a06d8c9e6536c388faad0e526a0f1b5d6cd.tar.gz packages_apps_Messaging-7e2d9a06d8c9e6536c388faad0e526a0f1b5d6cd.tar.bz2 packages_apps_Messaging-7e2d9a06d8c9e6536c388faad0e526a0f1b5d6cd.zip | |
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 <taesu82.lee@samsung.com>
Change-Id: I6e24bdfe6a037ab588914327dbd8abf3f30512ea
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()) { |