filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle delivered messages as completed messages

Browse Source 
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
This commit is contained in:
Taesu Lee
2020-04-24 09:40:22 +09:00
parent aa23161c03
commit 7ccb748e61
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/messaging/datamodel/data/ConversationMessageData.java
View File

@@ -523,7 +523,8 @@ public class ConversationMessageData {
} }
public boolean getIsSendComplete() { 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() { public String getSenderFullName() {
@@ -575,8 +576,9 @@ public class ConversationMessageData {
public boolean getCanForwardMessage() { public boolean getCanForwardMessage() {
// Even for outgoing messages, we only allow forwarding if the message has finished sending // Even for outgoing messages, we only allow forwarding if the message has finished sending
// as media often has issues when send isn't complete // as media often has issues when send isn't complete
return (mStatus == MessageData.BUGLE_STATUS_OUTGOING_COMPLETE || return (mStatus == MessageData.BUGLE_STATUS_OUTGOING_COMPLETE
mStatus == MessageData.BUGLE_STATUS_INCOMING_COMPLETE); || mStatus == MessageData.BUGLE_STATUS_OUTGOING_DELIVERED
|| mStatus == MessageData.BUGLE_STATUS_INCOMING_COMPLETE);
} }
public boolean getCanCopyMessageToClipboard() { public boolean getCanCopyMessageToClipboard() {

1
src/com/android/messaging/ui/conversation/ConversationMessageView.java
View File

@@ -377,6 +377,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
// FALL THROUGH HERE // FALL THROUGH HERE
case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE: case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE:
case MessageData.BUGLE_STATUS_OUTGOING_DELIVERED:
case MessageData.BUGLE_STATUS_INCOMING_COMPLETE: case MessageData.BUGLE_STATUS_INCOMING_COMPLETE:
default: default:
if (!mData.getCanClusterWithNextMessage()) { if (!mData.getCanClusterWithNextMessage()) {

1
src/com/android/messaging/widget/WidgetConversationService.java
View File

@@ -330,6 +330,7 @@ public class WidgetConversationService extends RemoteViewsService {
// FALL THROUGH HERE // FALL THROUGH HERE
case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE: case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE:
case MessageData.BUGLE_STATUS_OUTGOING_DELIVERED:
case MessageData.BUGLE_STATUS_INCOMING_COMPLETE: case MessageData.BUGLE_STATUS_INCOMING_COMPLETE:
default: default:
if (!message.getCanClusterWithNextMessage()) { if (!message.getCanClusterWithNextMessage()) {