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

Browse Source 
If a device own phone number is unknown and there is only a single
address in all TO and CC for incoming MMS, ignore the address as it is
device own phone number.

Test: Manual

Change-Id: I26de39bd3b71d3ad391372f35cfce0bd5c7b66ed
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
This commit is contained in:
Taesu Lee
2020-09-15 16:34:54 +09:00
parent 1303239498
commit 9c97af9b83
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
// associate this message with the thread composed of all the recipients
// EXCLUDING our own number. This includes the person who sent the
// message (the FROM field above) in addition to the other people the message
// was addressed TO (or CC fields to address group messaging compatibility
// issues with devices that place numbers in this field). Typically our own
// number is in the TO/CC field so we have to remove it in loadRecipients.
// EXCLUDING our own number. This includes the person who sent the message
// (the FROM field above) in addition to the other people the message was
// addressed TO (or CC fields to address group messaging compatibility issues
// with devices that place numbers in this field). Typically our own number is
// in the TO/CC field so we have to remove it in checkAndLoadToCcRecipients.
checkAndLoadToCcRecipients(recipients, addressMap, subPhoneNumber);
break;
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) {
// 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)) {
// Only add numbers which aren't already included.
recipients.add(number);