Merge "MAP: Fix parse email body for non RFC2822 complaint message." (3a845637) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -736,6 +736,7 @@ public class BluetoothMapbMessageMmsEmail extends BluetoothMapbMessage {
		throw new IllegalArgumentException("Ill-formatted bMessage, no END:MSG");
		}
		setEmailBody(body.substring(beginMsg + "BEGIN:MSG".length(), endMsg - CRLF.length()));
		break;
		} else {
		pos = next + CRLF.length();
		}
		@@ -753,12 +754,12 @@ public class BluetoothMapbMessageMmsEmail extends BluetoothMapbMessage {
		}
		} else {
		endVersionPos = (body.indexOf("--"+boundary+"--", beginVersionPos) - CRLF.length());
		}
		try {
		setEmailBody(body.substring(beginVersionPos, endVersionPos));
		} catch (IndexOutOfBoundsException e) {
		throw new IllegalArgumentException("Ill-formatted bMessage, no end boundary");
		}
		}
		} else if(rfc822Flag == 1) {
		endVersionPos = (body.indexOf("--"+boundary+"--", beginVersionPos));
		try {