Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92010ff5 authored by Tom Taylor's avatar Tom Taylor Committed by Android Git Automerger
Browse files

am dbac180d: Fix a merge problem with html mms 

Merge commit 'dbac180d' into gingerbread

* commit 'dbac180d':
  Fix a merge problem with html mms
parents 8138e841 dbac180d

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

+3 −1
Original line number Diff line number Diff line
@@ -157,9 +157,11 @@ public class PduParser { 
                }

                String ctTypeStr = new String(contentType);

                if (ctTypeStr.equals(ContentType.MULTIPART_MIXED)

                        || ctTypeStr.equals(ContentType.MULTIPART_RELATED)) {

                        || ctTypeStr.equals(ContentType.MULTIPART_RELATED)

                        || ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)) {

                    // The MMS content type must be "application/vnd.wap.multipart.mixed"

                    // or "application/vnd.wap.multipart.related"

                    // or "application/vnd.wap.multipart.alternative"

                    return retrieveConf;

                }

                return null;

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

+5 −2
Original line number Diff line number Diff line
@@ -422,7 +422,8 @@ public class PduPersister { 
                    // Store simple string values directly in the database instead of an

                    // external file.  This makes the text searchable and retrieval slightly

                    // faster.

                    if ("text/plain".equals(type) || "application/smil".equals(type)) {

                    if (ContentType.TEXT_PLAIN.equals(type) || ContentType.APP_SMIL.equals(type)

                            || ContentType.TEXT_HTML.equals(type)) {

                        String text = c.getString(PART_COLUMN_TEXT);

                        byte [] blob = new EncodedStringValue(text != null ? text : "")

                            .getTextString();
@@ -736,7 +737,9 @@ public class PduPersister { 


        try {

            byte[] data = part.getData();

            if ("text/plain".equals(contentType) || "application/smil".equals(contentType)) {

            if (ContentType.TEXT_PLAIN.equals(contentType)

                    || ContentType.APP_SMIL.equals(contentType)

                    || ContentType.TEXT_HTML.equals(contentType)) {

                ContentValues cv = new ContentValues();

                cv.put(Telephony.Mms.Part.TEXT, new EncodedStringValue(data).getString());

                if (mContentResolver.update(uri, cv, null, null) != 1) {