TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix gif NPE

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-24 14:05:48 -07:00 committed by Moxie Marlinspike
parent a2d63d117b
commit 24e14cbc73
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/mms/AttachmentManager.java
View File

@ -88,7 +88,7 @@ public class AttachmentManager {
} }
public void setImage(MasterSecret masterSecret, Uri image) throws IOException, BitmapDecodingException { public void setImage(MasterSecret masterSecret, Uri image) throws IOException, BitmapDecodingException {
if (MediaUtil.getMimeType(context, image).startsWith("image/gif")) { if (MediaUtil.isGif(MediaUtil.getMimeType(context, image))) {
setMedia(new GifSlide(context, masterSecret, image), masterSecret); setMedia(new GifSlide(context, masterSecret, image), masterSecret);
} else { } else {
setMedia(new ImageSlide(context, masterSecret, image), masterSecret); setMedia(new ImageSlide(context, masterSecret, image), masterSecret);

2
src/org/thoughtcrime/securesms/util/MediaUtil.java
View File

@ -84,7 +84,7 @@ public class MediaUtil {
return type; return type;
} }
private static boolean isGif(String contentType) { public static boolean isGif(String contentType) {
return !TextUtils.isEmpty(contentType) && contentType.trim().equals("image/gif"); return !TextUtils.isEmpty(contentType) && contentType.trim().equals("image/gif");
} }