From 502bed2f72cd2d5ef545c02ea9118b73235c6b2f Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 4 Jan 2019 00:32:45 +0100
Subject: [PATCH] enlage preview from attachment staging area, fixes #202

---
 src/org/thoughtcrime/securesms/MediaPreviewActivity.java  | 1 +
 src/org/thoughtcrime/securesms/mms/AttachmentManager.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 0a38ad4f7..9ae86ef97 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -220,6 +220,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
       Log.w(TAG, "Unsupported media type sent to MediaPreviewActivity, finishing.");
       Toast.makeText(getApplicationContext(), R.string.error, Toast.LENGTH_LONG).show();
       finish();
+      return;
     }
 
     Log.w(TAG, "Loading Part URI: " + initialMedia);
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index d9966f5b6..b4b33e297 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -462,6 +462,7 @@ public class AttachmentManager {
       intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
       intent.putExtra(MediaPreviewActivity.DC_MSG_ID, slide.getDcMsgId());
       intent.putExtra(MediaPreviewActivity.OUTGOING_EXTRA, true);
+      intent.setDataAndType(slide.getUri(), slide.getContentType());
 
       context.startActivity(intent);
     }