fix external gif sharing

mcginty · moxie0 · commit ae379cd3ddc6 · 2015-11-16T11:28:03.000-08:00
fixes signalapp#4539 Closes signalapp#4556 // FREEBIE
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -157,6 +157,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public static final String THREAD_ID_EXTRA         = "thread_id";
   public static final String DRAFT_TEXT_EXTRA        = "draft_text";
   public static final String DRAFT_IMAGE_EXTRA       = "draft_image";
+  public static final String DRAFT_GIF_EXTRA         = "draft_gif";
   public static final String DRAFT_AUDIO_EXTRA       = "draft_audio";
   public static final String DRAFT_VIDEO_EXTRA       = "draft_video";
   public static final String DISTRIBUTION_TYPE_EXTRA = "distribution_type";
@@ -710,12 +711,14 @@ private void handleSecurityChange(boolean isSecureText, boolean isSecureVoice) {
 
   private void initializeDraft() {
     String draftText  = getIntent().getStringExtra(DRAFT_TEXT_EXTRA);
+    Uri    draftGif   = getIntent().getParcelableExtra(DRAFT_GIF_EXTRA);
     Uri    draftImage = getIntent().getParcelableExtra(DRAFT_IMAGE_EXTRA);
     Uri    draftAudio = getIntent().getParcelableExtra(DRAFT_AUDIO_EXTRA);
     Uri    draftVideo = getIntent().getParcelableExtra(DRAFT_VIDEO_EXTRA);
 
     if (draftText != null)  composeText.setText(draftText);
 
+    if      (draftGif   != null) setMedia(draftGif,   MediaType.GIF);
     if      (draftImage != null) setMedia(draftImage, MediaType.IMAGE);
     else if (draftAudio != null) setMedia(draftAudio, MediaType.AUDIO);
     else if (draftVideo != null) setMedia(draftVideo, MediaType.VIDEO);
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -36,6 +36,7 @@
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.io.IOException;
@@ -188,7 +189,9 @@ private Intent getBaseShareIntent(final @NonNull Class<?> target) {
     final String type        = streamExtra != null ? getMimeType(streamExtra) : getIntent().getType();
 
     if (resolvedExtra != null) {
-      if (ContentType.isImageType(type)) {
+      if (MediaUtil.isGif(type)) {
+        intent.putExtra(ConversationActivity.DRAFT_GIF_EXTRA, resolvedExtra);
+      } else if (ContentType.isImageType(type)) {
         intent.putExtra(ConversationActivity.DRAFT_IMAGE_EXTRA, resolvedExtra);
       } else if (ContentType.isAudioType(type)) {
         intent.putExtra(ConversationActivity.DRAFT_AUDIO_EXTRA, resolvedExtra);
diff --git a/src/org/thoughtcrime/securesms/mms/GifSlide.java b/src/org/thoughtcrime/securesms/mms/GifSlide.java
@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import ws.com.google.android.mms.ContentType;
 import ws.com.google.android.mms.pdu.PduPart;
 
 public class GifSlide extends ImageSlide {
@@ -18,8 +19,8 @@ public GifSlide(Context context, Attachment attachment) {
     super(context, attachment);
   }
 
-  public GifSlide(Context context, Uri uri, long dataSize) throws IOException {
-    super(context, uri, dataSize);
+  public GifSlide(Context context, Uri uri, long size) throws IOException {
+    super(context, constructAttachmentFromUri(context, uri, ContentType.IMAGE_GIF, size));
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import java.io.IOException;`
`11`	`11`	`import java.io.InputStream;`
`12`	`12`
	`13`	`+import ws.com.google.android.mms.ContentType;`
`13`	`14`	`import ws.com.google.android.mms.pdu.PduPart;`
`14`	`15`
`15`	`16`	`public class GifSlide extends ImageSlide {`
`@@ -18,8 +19,8 @@ public GifSlide(Context context, Attachment attachment) {`
`18`	`19`	`super(context, attachment);`
`19`	`20`	`}`
`20`	`21`
`21`		`- public GifSlide(Context context, Uri uri, long dataSize) throws IOException {`
`22`		`- super(context, uri, dataSize);`
	`22`	`+ public GifSlide(Context context, Uri uri, long size) throws IOException {`
	`23`	`+ super(context, constructAttachmentFromUri(context, uri, ContentType.IMAGE_GIF, size));`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`@Override`