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

Handle delivered messages as completed messages am: 7ccb748e61 am: cbcb1628e5 am: 3548c16d15

Browse Source 
Change-Id: Iee9c4c2d5f59e755c319e14e19ff57a7f0312dd1
This commit is contained in:
Taesu Lee
2020-04-27 18:46:02 +00:00
committed by Automerger Merge Worker
parent c95b779f7a 3548c16d15
commit 948781c1ca
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/datamodel/data/ConversationMessageData.java
+5 -3
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() {
src/com/android/messaging/ui/conversation/ConversationMessageView.java
+1
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()) {
src/com/android/messaging/widget/WidgetConversationService.java
+1
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()) {