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 am: 948781c1ca am: e14e01592c

Browse Source 
Change-Id: I759e64c03b6ce38891af4b23711c55ef54ebb5b1
This commit is contained in:
Taesu Lee
2020-04-27 19:18:37 +00:00
committed by Automerger Merge Worker
parent 33aeb03d35 e14e01592c
commit a3320cbf93
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() {
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() {

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
case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE:
case MessageData.BUGLE_STATUS_OUTGOING_DELIVERED:
case MessageData.BUGLE_STATUS_INCOMING_COMPLETE:
default:
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
case MessageData.BUGLE_STATUS_OUTGOING_COMPLETE:
case MessageData.BUGLE_STATUS_OUTGOING_DELIVERED:
case MessageData.BUGLE_STATUS_INCOMING_COMPLETE:
default:
if (!message.getCanClusterWithNextMessage()) {