TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 14:06:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SMIL regression

Browse Source 
Closes #2654

// FREEBIE
This commit is contained in:
Jake McGinty
2015-03-12 13:39:19 -07:00
committed by Moxie Marlinspike
parent 761ccf4b3f
commit 073d019103
9 changed files with 97 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/thoughtcrime/securesms/mms/VideoSlide.java
View File

@@ -22,10 +22,6 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.thoughtcrime.securesms.util.ResUtil;
import org.thoughtcrime.securesms.util.SmilUtil;
import org.w3c.dom.smil.SMILDocument;
import org.w3c.dom.smil.SMILMediaElement;
import org.w3c.dom.smil.SMILRegionElement;
import ws.com.google.android.mms.pdu.PduPart;
import android.content.ContentResolver;
@@ -62,23 +58,6 @@ public class VideoSlide extends Slide {
return true;
}
@Override
public SMILRegionElement getSmilRegion(SMILDocument document) {
SMILRegionElement region = (SMILRegionElement) document.createElement("region");
region.setId("Image");
region.setLeft(0);
region.setTop(0);
region.setWidth(SmilUtil.ROOT_WIDTH);
region.setHeight(SmilUtil.ROOT_HEIGHT);
region.setFit("meet");
return region;
}
@Override
public SMILMediaElement getMediaElement(SMILDocument document) {
return SmilUtil.createMediaElement("video", document, new String(getPart().getName()));
}
private static PduPart constructPartFromUri(Context context, Uri uri)
throws IOException, MediaTooLargeException
{