From ebf6a2d833ee4b31e104de3cde68c824e9dba01e Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Mon, 22 Dec 2014 16:25:51 -0800
Subject: [PATCH] remove pointless Bitmap allocation for ImageSlides

Fixes #2248
// FREEBIE
---
 src/org/thoughtcrime/securesms/ConversationActivity.java  | 2 +-
 src/org/thoughtcrime/securesms/mms/AttachmentManager.java | 4 ++--
 src/org/thoughtcrime/securesms/mms/ImageSlide.java        | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 096ed52373..8f1cc1b27e 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -826,7 +826,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void addAttachmentImage(Uri imageUri) {
     try {
-      attachmentManager.setImage(masterSecret, imageUri);
+      attachmentManager.setImage(imageUri);
     } catch (IOException | BitmapDecodingException e) {
       Log.w(TAG, e);
       attachmentManager.clear();
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 60c294ea57..3beb1f002c 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -64,8 +64,8 @@ public class AttachmentManager {
     attachmentListener.onAttachmentChanged();
   }
 
-  public void setImage(MasterSecret masterSecret, Uri image) throws IOException, BitmapDecodingException {
-    setMedia(new ImageSlide(context, masterSecret, image), 345, 261);
+  public void setImage(Uri image) throws IOException, BitmapDecodingException {
+    setMedia(new ImageSlide(context, image), 345, 261);
   }
 
   public void setVideo(Uri video) throws IOException, MediaTooLargeException {
diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
index 170165bdfc..a2ee5f88e9 100644
--- a/src/org/thoughtcrime/securesms/mms/ImageSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
@@ -62,8 +62,8 @@ public class ImageSlide extends Slide {
     super(context, masterSecret, part);
   }
 
-  public ImageSlide(Context context, MasterSecret masterSecret, Uri uri) throws IOException, BitmapDecodingException {
-    super(context, constructPartFromUri(context, masterSecret, uri));
+  public ImageSlide(Context context, Uri uri) throws IOException, BitmapDecodingException {
+    super(context, constructPartFromUri(uri));
   }
 
   @Override
@@ -190,13 +190,11 @@ public class ImageSlide extends Slide {
     return SmilUtil.createMediaElement("img", document, new String(getPart().getName()));
   }
 
-  private static PduPart constructPartFromUri(Context context, MasterSecret masterSecret, Uri uri)
+  private static PduPart constructPartFromUri(Uri uri)
       throws IOException, BitmapDecodingException
   {
     PduPart part = new PduPart();
-    byte[] data  = BitmapUtil.createScaledBytes(context, masterSecret, uri, 1280, 1280, MAX_MESSAGE_SIZE);
 
-    part.setData(data);
     part.setDataUri(uri);
     part.setContentType(ContentType.IMAGE_JPEG.getBytes());
     part.setContentId((System.currentTimeMillis()+"").getBytes());