From 7617a19280d7d7c6d716ce366419db5993cc3254 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 25 Aug 2015 11:11:53 +0200
Subject: additonal null checks in file backend

---
 src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/eu/siacs/conversations/persistance')

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 9381ba1d8..628f56303 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -137,6 +137,9 @@ public class FileBackend {
 		options.inJustDecodeBounds = true;
 		try {
 			BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(uri), null, options);
+			if (options == null || options.outMimeType == null) {
+				return false;
+			}
 			return (options.outWidth <= Config.IMAGE_SIZE && options.outHeight <= Config.IMAGE_SIZE && options.outMimeType.contains(Config.IMAGE_FORMAT.name().toLowerCase()));
 		} catch (FileNotFoundException e) {
 			return false;
-- 
cgit v1.2.3


From ae9de26f597b63733e584e65e51adbfd1df755ad Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Tue, 25 Aug 2015 12:40:22 +0200
Subject: remove unused imports.

---
 src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/persistance')

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 628f56303..d5e4645ea 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -1,6 +1,5 @@
 package eu.siacs.conversations.persistance;
 
-import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -8,7 +7,6 @@ import android.graphics.Matrix;
 import android.graphics.RectF;
 import android.net.Uri;
 import android.os.Environment;
-import android.provider.MediaStore;
 import android.util.Base64;
 import android.util.Base64OutputStream;
 import android.util.Log;
-- 
cgit v1.2.3