mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-24 01:21:09 +00:00
media constraints model
// FREEBIE
This commit is contained in:
committed by
Moxie Marlinspike
parent
a0ed0842a0
commit
b25b95f933
72
src/org/thoughtcrime/securesms/mms/MediaConstraints.java
Normal file
72
src/org/thoughtcrime/securesms/mms/MediaConstraints.java
Normal file
@@ -0,0 +1,72 @@
|
||||
package org.thoughtcrime.securesms.mms;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.util.Log;
|
||||
import android.util.Pair;
|
||||
|
||||
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
import org.thoughtcrime.securesms.util.BitmapDecodingException;
|
||||
import org.thoughtcrime.securesms.util.BitmapUtil;
|
||||
import org.thoughtcrime.securesms.util.MediaUtil;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import ws.com.google.android.mms.pdu.PduPart;
|
||||
|
||||
public abstract class MediaConstraints {
|
||||
private static final String TAG = MediaConstraints.class.getSimpleName();
|
||||
|
||||
public static MediaConstraints MMS_CONSTRAINTS = new MmsMediaConstraints();
|
||||
public static MediaConstraints PUSH_CONSTRAINTS = new PushMediaConstraints();
|
||||
|
||||
public abstract int getImageMaxWidth();
|
||||
public abstract int getImageMaxHeight();
|
||||
public abstract int getImageMaxSize();
|
||||
|
||||
public abstract int getVideoMaxSize();
|
||||
|
||||
public abstract int getAudioMaxSize();
|
||||
|
||||
public boolean isSatisfied(Context context, MasterSecret masterSecret, PduPart part) {
|
||||
try {
|
||||
return (MediaUtil.isImage(part) && part.getDataSize() <= getImageMaxSize() && isWithinBounds(context, masterSecret, part.getDataUri())) ||
|
||||
(MediaUtil.isAudio(part) && part.getDataSize() <= getAudioMaxSize()) ||
|
||||
(MediaUtil.isVideo(part) && part.getDataSize() <= getVideoMaxSize()) ||
|
||||
(!MediaUtil.isImage(part) && !MediaUtil.isAudio(part) && !MediaUtil.isVideo(part));
|
||||
} catch (IOException ioe) {
|
||||
Log.w(TAG, "Failed to determine if media's constraints are satisfied.", ioe);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isWithinBounds(Context context, MasterSecret masterSecret, Uri uri) throws IOException {
|
||||
InputStream is = PartAuthority.getPartStream(context, masterSecret, uri);
|
||||
Pair<Integer, Integer> dimensions = BitmapUtil.getDimensions(is);
|
||||
return dimensions.first > 0 && dimensions.first <= getImageMaxWidth() &&
|
||||
dimensions.second > 0 && dimensions.second <= getImageMaxHeight();
|
||||
}
|
||||
|
||||
public boolean canResize(PduPart part) {
|
||||
return part != null && MediaUtil.isImage(part);
|
||||
}
|
||||
|
||||
public byte[] getResizedMedia(Context context, MasterSecret masterSecret, PduPart part)
|
||||
throws IOException
|
||||
{
|
||||
if (!canResize(part) || part.getDataUri() == null) {
|
||||
throw new UnsupportedOperationException("Cannot resize this content type");
|
||||
}
|
||||
|
||||
try {
|
||||
return BitmapUtil.createScaledBytes(context, masterSecret, part.getDataUri(),
|
||||
getImageMaxWidth(),
|
||||
getImageMaxHeight(),
|
||||
getImageMaxSize());
|
||||
} catch (BitmapDecodingException bde) {
|
||||
throw new IOException(bde);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
31
src/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java
Normal file
31
src/org/thoughtcrime/securesms/mms/MmsMediaConstraints.java
Normal file
@@ -0,0 +1,31 @@
|
||||
package org.thoughtcrime.securesms.mms;
|
||||
|
||||
public class MmsMediaConstraints extends MediaConstraints {
|
||||
private static final int MAX_IMAGE_DIMEN = 1280;
|
||||
public static final int MAX_MESSAGE_SIZE = 280 * 1024;
|
||||
|
||||
@Override
|
||||
public int getImageMaxWidth() {
|
||||
return MAX_IMAGE_DIMEN;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getImageMaxHeight() {
|
||||
return MAX_IMAGE_DIMEN;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getImageMaxSize() {
|
||||
return MAX_MESSAGE_SIZE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getVideoMaxSize() {
|
||||
return MAX_MESSAGE_SIZE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAudioMaxSize() {
|
||||
return MAX_MESSAGE_SIZE;
|
||||
}
|
||||
}
|
||||
32
src/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
Normal file
32
src/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
Normal file
@@ -0,0 +1,32 @@
|
||||
package org.thoughtcrime.securesms.mms;
|
||||
|
||||
public class PushMediaConstraints extends MediaConstraints {
|
||||
private static final int MAX_IMAGE_DIMEN = 1280;
|
||||
private static final int KB = 1024;
|
||||
private static final int MB = 1024 * KB;
|
||||
|
||||
@Override
|
||||
public int getImageMaxWidth() {
|
||||
return MAX_IMAGE_DIMEN;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getImageMaxHeight() {
|
||||
return MAX_IMAGE_DIMEN;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getImageMaxSize() {
|
||||
return 300 * KB;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getVideoMaxSize() {
|
||||
return MmsMediaConstraints.MAX_MESSAGE_SIZE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAudioMaxSize() {
|
||||
return MmsMediaConstraints.MAX_MESSAGE_SIZE;
|
||||
}
|
||||
}
|
||||
@@ -36,8 +36,6 @@ import ws.com.google.android.mms.pdu.PduPart;
|
||||
|
||||
public abstract class Slide {
|
||||
|
||||
public static final int MAX_MESSAGE_SIZE = 280 * 1024;
|
||||
|
||||
protected final PduPart part;
|
||||
protected final Context context;
|
||||
protected MasterSecret masterSecret;
|
||||
@@ -124,7 +122,7 @@ public abstract class Slide {
|
||||
|
||||
while ((read = in.read(buffer)) != -1) {
|
||||
size += read;
|
||||
if (size > MAX_MESSAGE_SIZE) throw new MediaTooLargeException("Media exceeds maximum message size.");
|
||||
if (size > MmsMediaConstraints.MAX_MESSAGE_SIZE) throw new MediaTooLargeException("Media exceeds maximum message size.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,10 +75,12 @@ public class VideoSlide extends Slide {
|
||||
return SmilUtil.createMediaElement("video", document, new String(getPart().getName()));
|
||||
}
|
||||
|
||||
private static PduPart constructPartFromUri(Context context, Uri uri) throws IOException, MediaTooLargeException {
|
||||
PduPart part = new PduPart();
|
||||
private static PduPart constructPartFromUri(Context context, Uri uri)
|
||||
throws IOException, MediaTooLargeException
|
||||
{
|
||||
PduPart part = new PduPart();
|
||||
ContentResolver resolver = context.getContentResolver();
|
||||
Cursor cursor = null;
|
||||
Cursor cursor = null;
|
||||
|
||||
try {
|
||||
cursor = resolver.query(uri, new String[] {MediaStore.Video.Media.MIME_TYPE}, null, null, null);
|
||||
|
||||
Reference in New Issue
Block a user