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

Fix creating a new conversation including own number am: 9c97af9b83

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: I692d40a9ab2d1f262ed2ad5a12cc47a7cdc46d64
This commit is contained in:
Taesu Lee
2020-09-16 19:41:45 +00:00
committed by Automerger Merge Worker
parent d5da09e85f 9c97af9b83
commit e7df722655
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/messaging/mmslib/pdu/PduPersister.java
View File

@@ -1415,11 +1415,11 @@ public class PduPersister {
// For received messages (whether group MMS is enabled or not) we want to // For received messages (whether group MMS is enabled or not) we want to
// associate this message with the thread composed of all the recipients // associate this message with the thread composed of all the recipients
// EXCLUDING our own number. This includes the person who sent the // EXCLUDING our own number. This includes the person who sent the message
// message (the FROM field above) in addition to the other people the message // (the FROM field above) in addition to the other people the message was
// was addressed TO (or CC fields to address group messaging compatibility // addressed TO (or CC fields to address group messaging compatibility issues
// issues with devices that place numbers in this field). Typically our own // with devices that place numbers in this field). Typically our own number is
// number is in the TO/CC field so we have to remove it in loadRecipients. // in the TO/CC field so we have to remove it in checkAndLoadToCcRecipients.
checkAndLoadToCcRecipients(recipients, addressMap, subPhoneNumber); checkAndLoadToCcRecipients(recipients, addressMap, subPhoneNumber);
break; break;
case PduHeaders.MESSAGE_TYPE_SEND_REQ: case PduHeaders.MESSAGE_TYPE_SEND_REQ:
@@ -1582,9 +1582,17 @@ public class PduPersister {
} }
} }
} }
// If selfNumber is unavailable and there is only a single address in all TO and CC, we can
// skip adding it into recipients as assuming it is my own phone number.
final boolean isSelfNumberUnavailable = TextUtils.isEmpty(selfNumber);
if (isSelfNumberUnavailable && numbers.size() == 1) {
return;
}
for (final String number : numbers) { for (final String number : numbers) {
// Only add numbers which aren't my own number. // Only add numbers which aren't my own number.
if (TextUtils.isEmpty(selfNumber) || !PhoneNumberUtils.compare(number, selfNumber)) { if (isSelfNumberUnavailable || !PhoneNumberUtils.compare(number, selfNumber)) {
if (!recipients.contains(number)) { if (!recipients.contains(number)) {
// Only add numbers which aren't already included. // Only add numbers which aren't already included.
recipients.add(number); recipients.add(number);