use wildcard media types, don't crash on preview fail

mcginty · mcginty · commit 31167d11ddec · 2014-10-17T17:59:56.000-07:00
// FREEBIE
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -67,6 +67,7 @@
     <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Fallback to unencrypted SMS?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Fallback to unencrypted MMS?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">This message will <b>not</b> be encrypted because a secure session could not be established.\n\nSend insecure message?</string>
+    <string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
 
     <!-- ConversationActivity -->
     <string name="ConversationActivity_initiate_secure_session_question">Initiate secure session?</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms;
 
 import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -36,6 +37,7 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
@@ -446,7 +448,12 @@ private void fireIntent() {
       Intent intent = new Intent(Intent.ACTION_VIEW);
       intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
       intent.setDataAndType(slide.getUri(), slide.getContentType());
-      context.startActivity(intent);
+      try {
+        context.startActivity(intent);
+      } catch (ActivityNotFoundException anfe) {
+        Log.w(TAG, "No activity existed to view the media.");
+        Toast.makeText(context, R.string.ConversationItem_unable_to_open_media, Toast.LENGTH_LONG).show();
+      }
     }
 
     public void onClick(View v) {
diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/src/org/thoughtcrime/securesms/mms/AudioSlide.java
@@ -38,6 +38,11 @@ public AudioSlide(Context context, PduPart part) {
     super(context, part);
   }
 
+  @Override
+  public String getContentType() {
+    return "audio/*";
+  }
+
   public AudioSlide(Context context, Uri uri) throws IOException, MediaTooLargeException {
     super(context, constructPartFromUri(context, uri));
   }
diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
@@ -60,6 +60,11 @@ public ImageSlide(Context context, MasterSecret masterSecret, PduPart part) {
     super(context, masterSecret, part);
   }
 
+  @Override
+  public String getContentType() {
+    return "image/*";
+  }
+
   public ImageSlide(Context context, Uri uri) throws IOException, BitmapDecodingException {
     super(context, constructPartFromUri(context, uri));
   }
diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/src/org/thoughtcrime/securesms/mms/VideoSlide.java
@@ -39,6 +39,11 @@ public VideoSlide(Context context, PduPart part) {
     super(context, part);
   }
 
+  @Override
+  public String getContentType() {
+    return "video/*";
+  }
+
   public VideoSlide(Context context, Uri uri) throws IOException, MediaTooLargeException {
     super(context, constructPartFromUri(context, uri));
   }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ public AudioSlide(Context context, PduPart part) {`
`38`	`38`	`super(context, part);`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ @Override`
	`42`	`+ public String getContentType() {`
	`43`	`+ return "audio/*";`
	`44`	`+ }`
	`45`	`+`
`41`	`46`	`public AudioSlide(Context context, Uri uri) throws IOException, MediaTooLargeException {`
`42`	`47`	`super(context, constructPartFromUri(context, uri));`
`43`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,11 @@ public ImageSlide(Context context, MasterSecret masterSecret, PduPart part) {`
`60`	`60`	`super(context, masterSecret, part);`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ @Override`
	`64`	`+ public String getContentType() {`
	`65`	`+ return "image/*";`
	`66`	`+ }`
	`67`	`+`
`63`	`68`	`public ImageSlide(Context context, Uri uri) throws IOException, BitmapDecodingException {`
`64`	`69`	`super(context, constructPartFromUri(context, uri));`
`65`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,11 @@ public VideoSlide(Context context, PduPart part) {`
`39`	`39`	`super(context, part);`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ @Override`
	`43`	`+ public String getContentType() {`
	`44`	`+ return "video/*";`
	`45`	`+ }`
	`46`	`+`
`42`	`47`	`public VideoSlide(Context context, Uri uri) throws IOException, MediaTooLargeException {`
`43`	`48`	`super(context, constructPartFromUri(context, uri));`
`44`	`49`	`}`