1 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 9ef92a07e..6d4fdba0e 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -432,10 +432,16 @@ public class FileBackend {
 
 	private Bitmap getVideoPreview(File file, int size) {
 		MediaMetadataRetriever metadataRetriever = new MediaMetadataRetriever();
-		metadataRetriever.setDataSource(file.getAbsolutePath());
-		Bitmap frame = metadataRetriever.getFrameAtTime(0);
-		metadataRetriever.release();
-		frame = resize(frame, size);
+		Bitmap frame;
+		try {
+			metadataRetriever.setDataSource(file.getAbsolutePath());
+			frame = metadataRetriever.getFrameAtTime(0);
+			metadataRetriever.release();
+			frame = resize(frame, size);
+		} catch(IllegalArgumentException e) {
+			frame = Bitmap.createBitmap(size,size, Bitmap.Config.ARGB_8888);
+			frame.eraseColor(0xff000000);
+		}
 		Canvas canvas = new Canvas(frame);
 		Bitmap play = BitmapFactory.decodeResource(mXmppConnectionService.getResources(), R.drawable.play_video);
 		float x = (frame.getWidth() - play.getWidth()) / 2.0f;
@@ -705,8 +711,9 @@ public class FileBackend {
 
 	public void updateFileParams(Message message, URL url) {
 		DownloadableFile file = getFile(message);
-		boolean image = message.getType() == Message.TYPE_IMAGE || file.getMimeType().startsWith("image/");
-		boolean video = message.getMimeType().startsWith("video/");
+		final String mime = file.getMimeType();
+		boolean image = message.getType() == Message.TYPE_IMAGE || (mime != null && mime.startsWith("image/"));
+		boolean video = mime != null && mime.startsWith("video/");
 		if (image || video) {
 			try {
 				Dimensions dimensions = image ? getImageDimensions(file) : getVideoDimensions(file);