Merge "Enable sending group MMS" into rvc-dev am: 9d130d7746 (e3b3ac4e) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+20 −6

Original line number	Diff line number	Diff line
		@@ -2683,7 +2683,21 @@ public class BluetoothMapContentObserver {
		}
		getMsgListMsg().put(handle, newMsg);
		}
		} else { // type SMS_* of MMS
		} else if (msg.getType().equals(TYPE.MMS) && (recipientList.size() > 1)) {
		// Group MMS
		String folder = folderElement.getName();
		ArrayList<String> telNums = new ArrayList<String>();
		for (BluetoothMapbMessage.VCard recipient : recipientList) {
		// Only send the message to the top level recipient
		if (recipient.getEnvLevel() == 0) {
		// Only send to recipient's first phone number
		telNums.add(recipient.getFirstPhoneNumber());
		}
		}
		// Send message if folder is outbox else just store in draft
		handle = sendMmsMessage(folder, telNums.toArray(new String[telNums.size()]),
		(BluetoothMapbMessageMime) msg, transparent, retry);
		} else { // type SMS_* (single or mass text) or single MMS
		for (BluetoothMapbMessage.VCard recipient : recipientList) {
		// Only send the message to the top level recipient
		if (recipient.getEnvLevel() == 0) {
		@@ -2720,8 +2734,8 @@ public class BluetoothMapContentObserver {

		if (msg.getType().equals(TYPE.MMS)) {
		/* Send message if folder is outbox else just store in draft*/
		handle = sendMmsMessage(folder, phone, (BluetoothMapbMessageMime) msg,
		transparent, retry);
		handle = sendMmsMessage(folder, new String[] {phone},
		(BluetoothMapbMessageMime) msg, transparent, retry);
		} else if (msg.getType().equals(TYPE.SMS_GSM) \|\| msg.getType()
		.equals(TYPE.SMS_CDMA)) {
		/* Add the message to the database */
		@@ -2811,7 +2825,7 @@ public class BluetoothMapContentObserver {
		return handle;
		}

		public long sendMmsMessage(String folder, String toAddress, BluetoothMapbMessageMime msg,
		public long sendMmsMessage(String folder, String[] toAddress, BluetoothMapbMessageMime msg,
		int transparent, int retry) {
		/*
		*strategy:
		@@ -2896,7 +2910,7 @@ public class BluetoothMapContentObserver {
		}
		}

		private long pushMmsToFolder(int folder, String toAddress, BluetoothMapbMessageMime msg) {
		private long pushMmsToFolder(int folder, String[] toAddress, BluetoothMapbMessageMime msg) {
		/**
		* strategy:
		* 1) parse msg into parts + header
		@@ -3096,7 +3110,7 @@ public class BluetoothMapContentObserver {

		values.clear();
		values.put(Mms.Addr.CONTACT_ID, "null");
		values.put(Mms.Addr.ADDRESS, toAddress);
		values.put(Mms.Addr.ADDRESS, String.join(",", toAddress));
		values.put(Mms.Addr.TYPE, BluetoothMapContent.MMS_TO);
		values.put(Mms.Addr.CHARSET, 106);