diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/src/org/thoughtcrime/securesms/mms/AudioSlide.java index c1425ebd6..a20c85099 100644 --- a/src/org/thoughtcrime/securesms/mms/AudioSlide.java +++ b/src/org/thoughtcrime/securesms/mms/AudioSlide.java @@ -42,7 +42,7 @@ public class AudioSlide extends Slide { } public AudioSlide(Context context, Uri uri, long dataSize, boolean voiceNote) { - super(context, constructAttachmentFromUri(context, uri, MediaUtil.AUDIO_UNSPECIFIED, dataSize, 0, 0, false, null, voiceNote)); + super(context, constructAttachmentFromUri(context, uri, MediaUtil.AUDIO_UNSPECIFIED, dataSize, 0, 0, null, null, voiceNote)); } public AudioSlide(Context context, Uri uri, long dataSize, String contentType, boolean voiceNote) { diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java index 7c9d6d3b1..043a6ed75 100644 --- a/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java +++ b/src/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java @@ -29,16 +29,6 @@ class DecryptableStreamLocalUriFetcher extends StreamLocalUriFetcher { @Override protected InputStream loadResource(Uri uri, ContentResolver contentResolver) throws FileNotFoundException { - if (MediaUtil.hasVideoThumbnail(uri)) { - Bitmap thumbnail = MediaUtil.getVideoThumbnail(context, uri); - - if (thumbnail != null) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - thumbnail.compress(Bitmap.CompressFormat.JPEG, 100, baos); - return new ByteArrayInputStream(baos.toByteArray()); - } - } - try { return PartAuthority.getAttachmentStream(context, uri); } catch (IOException ioe) { diff --git a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java index 096927052..8b9de8c54 100644 --- a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java +++ b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java @@ -29,7 +29,7 @@ public class DocumentSlide extends Slide { @NonNull String contentType, long size, @Nullable String fileName) { - super(context, constructAttachmentFromUri(context, uri, contentType, size, 0, 0, true, StorageUtil.getCleanFileName(fileName), false)); + super(context, constructAttachmentFromUri(context, uri, contentType, size, 0, 0, uri, StorageUtil.getCleanFileName(fileName), false)); } @Override diff --git a/src/org/thoughtcrime/securesms/mms/GifSlide.java b/src/org/thoughtcrime/securesms/mms/GifSlide.java index d10c6ce0b..d445983d7 100644 --- a/src/org/thoughtcrime/securesms/mms/GifSlide.java +++ b/src/org/thoughtcrime/securesms/mms/GifSlide.java @@ -20,7 +20,7 @@ public class GifSlide extends ImageSlide { } public GifSlide(Context context, Uri uri, long size, int width, int height) { - super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_GIF, size, width, height, true, null, false)); + super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_GIF, size, width, height, uri, null, false)); } @Override diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java index b32b8e892..94bd850be 100644 --- a/src/org/thoughtcrime/securesms/mms/ImageSlide.java +++ b/src/org/thoughtcrime/securesms/mms/ImageSlide.java @@ -44,7 +44,7 @@ public class ImageSlide extends Slide { } public ImageSlide(Context context, Uri uri, long size, int width, int height) { - super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_JPEG, size, width, height, true, null, false)); + super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_JPEG, size, width, height, uri, null, false)); } @Override diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java index eacde0073..264ec511e 100644 --- a/src/org/thoughtcrime/securesms/mms/Slide.java +++ b/src/org/thoughtcrime/securesms/mms/Slide.java @@ -130,7 +130,7 @@ public abstract class Slide { long size, int width, int height, - boolean hasThumbnail, + @Nullable Uri thumbnailUri, @Nullable String fileName, boolean voiceNote) { @@ -138,7 +138,7 @@ public abstract class Slide { String resolvedType = Optional.fromNullable(MediaUtil.getMimeType(context, uri)).or(defaultMime); String fastPreflightId = String.valueOf(SecureRandom.getInstance("SHA1PRNG").nextLong()); return new UriAttachment(uri, - hasThumbnail ? uri : null, + thumbnailUri, resolvedType, AttachmentDatabase.TRANSFER_PROGRESS_STARTED, size, diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/src/org/thoughtcrime/securesms/mms/VideoSlide.java index bb11f1416..fee89c0f5 100644 --- a/src/org/thoughtcrime/securesms/mms/VideoSlide.java +++ b/src/org/thoughtcrime/securesms/mms/VideoSlide.java @@ -27,13 +27,24 @@ import com.b44t.messenger.DcMsg; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.DcAttachment; +import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.ResUtil; +import java.io.File; + public class VideoSlide extends Slide { + private static Attachment constructVideoAttachment(Context context, Uri uri, long dataSize) + { + Uri thumbnailUri = Uri.fromFile(new File(DcHelper.getContext(context).getBlobdirFile("temp-preview.jpg"))); + MediaUtil.ThumbnailSize retWh = new MediaUtil.ThumbnailSize(0, 0); + MediaUtil.createVideoThumbnailIfNeeded(context, uri, thumbnailUri, retWh); + return constructAttachmentFromUri(context, uri, MediaUtil.VIDEO_UNSPECIFIED, dataSize, retWh.width, retWh.height, thumbnailUri, null, false); + } + public VideoSlide(Context context, Uri uri, long dataSize) { - super(context, constructAttachmentFromUri(context, uri, MediaUtil.VIDEO_UNSPECIFIED, dataSize, 0, 0, MediaUtil.hasVideoThumbnail(uri), null, false)); + super(context, constructVideoAttachment(context, uri, dataSize)); } public VideoSlide(Context context, DcMsg dcMsg) { diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/src/org/thoughtcrime/securesms/util/MediaUtil.java index 93e86d7d4..8e5ae3bb2 100644 --- a/src/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/src/org/thoughtcrime/securesms/util/MediaUtil.java @@ -243,33 +243,6 @@ public class MediaUtil { return (null != contentType) && contentType.startsWith("video/"); } - public static boolean hasVideoThumbnail(Uri uri) { - Log.w(TAG, "Checking: " + uri); - - if (uri == null || !ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) { - return false; - } - - if ("com.android.providers.media.documents".equals(uri.getAuthority())) { - return uri.getLastPathSegment().contains("video"); - } - - return false; - } - - public static @Nullable Bitmap getVideoThumbnail(Context context, Uri uri) { - if ("com.android.providers.media.documents".equals(uri.getAuthority())) { - long videoId = Long.parseLong(uri.getLastPathSegment().split(":")[1]); - - return MediaStore.Video.Thumbnails.getThumbnail(context.getContentResolver(), - videoId, - MediaStore.Images.Thumbnails.MINI_KIND, - null); - } - - return null; - } - public static class ThumbnailSize { public ThumbnailSize(int width, int height) { this.width = width;