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

revert content-type generics
This commit is contained in:
Moxie Marlinspike 2014-10-22 19:37:45 -07:00
commit 9dfaf19516
3 changed files with 0 additions and 15 deletions

View File

@ -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));
}

View File

@ -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));
}

View File

@ -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));
}