Merge branch 'development' of https://github.com/siacs/Conversations into siacs-development

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 1b80a00a6..fb61691c2 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -33,7 +33,7 @@ import android.webkit.MimeTypeMap;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Downloadable;
+import eu.siacs.conversations.entities.Transferable;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.XmppConnectionService;
@@ -80,7 +80,7 @@ public class FileBackend {
 			if (path.startsWith("/")) {
 				return new DownloadableFile(path);
 			} else {
-				if (Arrays.asList(Downloadable.VALID_IMAGE_EXTENSIONS).contains(extension)) {
+				if (Arrays.asList(Transferable.VALID_IMAGE_EXTENSIONS).contains(extension)) {
 					return new DownloadableFile(getConversationsFileDirectory() + path);
 				} else {
 					return new DownloadableFile(getConversationsImageDirectory() + path);
@@ -235,6 +235,8 @@ public class FileBackend {
 			} else {
 				throw new FileCopyException(R.string.error_out_of_memory);
 			}
+		} catch (NullPointerException e) {
+			throw new FileCopyException(R.string.error_io_exception);
 		} finally {
 			close(os);
 			close(is);