am 7d177dd3: Merge "mms: also load group message recipients from CC field"
* commit '7d177dd3cb42c3246478abcc2bf69200e1d59fe6':
mms: also load group message recipients from CC field
diff --git a/src/java/com/google/android/mms/pdu/PduPersister.java b/src/java/com/google/android/mms/pdu/PduPersister.java
index 61b80aa..94f1430 100644
--- a/src/java/com/google/android/mms/pdu/PduPersister.java
+++ b/src/java/com/google/android/mms/pdu/PduPersister.java
@@ -1347,6 +1347,11 @@
// we have to ignore it in loadRecipients.
if (groupMmsEnabled) {
loadRecipients(PduHeaders.TO, recipients, addressMap, true);
+
+ // Also load any numbers in the CC field to address group messaging
+ // compatibility issues with devices that place numbers in this field
+ // for group messages.
+ loadRecipients(PduHeaders.CC, recipients, addressMap, true);
}
break;
case PduHeaders.MESSAGE_TYPE_SEND_REQ:
@@ -1442,8 +1447,8 @@
/**
* For a given address type, extract the recipients from the headers.
*
- * @param addressType can be PduHeaders.FROM or PduHeaders.TO
- * @param recipients a HashSet that is loaded with the recipients from the FROM or TO headers
+ * @param addressType can be PduHeaders.FROM, PduHeaders.TO or PduHeaders.CC
+ * @param recipients a HashSet that is loaded with the recipients from the FROM, TO or CC headers
* @param addressMap a HashMap of the addresses from the ADDRESS_FIELDS header
* @param excludeMyNumber if true, the number of this phone will be excluded from recipients
*/
