From f4eebd091ce3be0e429c2f5ea9de292317d7d8a6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 14 May 2014 18:32:58 +0200
Subject: fixed #105

---
 src/eu/siacs/conversations/services/XmppConnectionService.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/eu/siacs/conversations/services/XmppConnectionService.java')

diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index df2ee6a0..90c941e3 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -476,16 +476,15 @@ public class XmppConnectionService extends Service {
 
 			@Override
 			public void run() {
-				JingleFile file = getFileBackend().copyImageToPrivateStorage(
-						message, uri);
-				if (file == null) {
-					callback.error(R.string.error_copying_image_file);
-				} else {
+				try {
+					getFileBackend().copyImageToPrivateStorage(message, uri);
 					if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
 						getPgpEngine().encrypt(message, callback);
 					} else {
 						callback.success();
 					}
+				} catch (FileBackend.ImageCopyException e) {
+					callback.error(e.getResId());
 				}
 			}
 		}).start();
-- 
cgit v1.2.3