From 5cb94f02b3587b0649bff667b4d1c351ee59949e Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Thu, 2 Apr 2015 11:07:47 -0700 Subject: [PATCH] Fix failed SMIL generation when part name is null Fixes #2851 Closes #2866 // FREEBIE --- src/org/thoughtcrime/securesms/util/SmilUtil.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/org/thoughtcrime/securesms/util/SmilUtil.java b/src/org/thoughtcrime/securesms/util/SmilUtil.java index 8b5e46c4d8..59599bdd1a 100644 --- a/src/org/thoughtcrime/securesms/util/SmilUtil.java +++ b/src/org/thoughtcrime/securesms/util/SmilUtil.java @@ -5,8 +5,6 @@ import android.util.Log; import org.thoughtcrime.securesms.dom.smil.SmilDocumentImpl; import org.thoughtcrime.securesms.dom.smil.parser.SmilXmlSerializer; import org.thoughtcrime.securesms.mms.PartParser; -import org.thoughtcrime.securesms.mms.Slide; -import org.thoughtcrime.securesms.mms.SlideDeck; import org.w3c.dom.smil.SMILDocument; import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.SMILLayoutElement; @@ -20,7 +18,6 @@ import java.io.ByteArrayOutputStream; import ws.com.google.android.mms.ContentType; import ws.com.google.android.mms.pdu.PduBody; -import ws.com.google.android.mms.pdu.PduParser; import ws.com.google.android.mms.pdu.PduPart; public class SmilUtil { @@ -114,7 +111,9 @@ public class SmilUtil { } else { tag = "ref"; } - return createMediaElement(tag, document, new String(part.getName())); + return createMediaElement(tag, document, new String(part.getName() == null + ? new byte[]{} + : part.getName())); } private static SMILMediaElement createMediaElement(String tag, SMILDocument document, String src) {