Merge pull request #2028 from mcginty/revert-generic-contenttype

revert content-type generics

src/org/thoughtcrime/securesms/mms/AudioSlide.java

@@ -38,11 +38,6 @@ public class AudioSlide extends Slide {
     super(context, part);
   }
 
-  @Override
-  public String getContentType() {
-    return "audio/*";
-  }
-
   public AudioSlide(Context context, Uri uri) throws IOException, MediaTooLargeException {
     super(context, constructPartFromUri(context, uri));
   }

src/org/thoughtcrime/securesms/mms/ImageSlide.java

@@ -60,11 +60,6 @@ public class ImageSlide extends Slide {
     super(context, masterSecret, part);
   }
 
-  @Override
-  public String getContentType() {
-    return "image/*";
-  }
-
   public ImageSlide(Context context, Uri uri) throws IOException, BitmapDecodingException {
     super(context, constructPartFromUri(context, uri));
   }

src/org/thoughtcrime/securesms/mms/VideoSlide.java

@@ -39,11 +39,6 @@ public class VideoSlide extends Slide {
     super(context, part);
   }
 
-  @Override
-  public String getContentType() {
-    return "video/*";
-  }
-
   public VideoSlide(Context context, Uri uri) throws IOException, MediaTooLargeException {
     super(context, constructPartFromUri(context, uri));
   }