parse nested multipart message (4b9633c2) · Commits · e / os / android_frameworks_base

core/java/com/google/android/mms/pdu/PduParser.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -739,6 +739,7 @@ public class PduParser {
		} else {
		part.setContentType((PduContentTypes.contentTypes[0]).getBytes()); //"/"
		}
		String contentTypeStr = new String(part.getContentType());

		/* get name parameter */
		byte[] name = (byte[]) map.get(PduPart.P_NAME);
		@@ -780,6 +781,11 @@ public class PduParser {
		if (dataLength > 0) {
		byte[] partData = new byte[dataLength];
		pduDataStream.read(partData, 0, dataLength);
		if (contentTypeStr.equalsIgnoreCase(ContentType.MULTIPART_ALTERNATIVE)) {
		PduBody nestedBody = parseParts(new ByteArrayInputStream(partData));
		part = nestedBody.getPart(0);

		} else {
		// Check Content-Transfer-Encoding.
		byte[] partDataEncoding = part.getContentTransferEncoding();
		if (null != partDataEncoding) {
		@@ -799,6 +805,7 @@ public class PduParser {
		return null;
		}
		part.setData(partData);
		} /* multipart/alternative */
		}

		/* add this part to body */