do not touch pictures that are already in the right format

fixed #522

2 files changed, 22 insertions, 13 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index 1b49e365..5def05dd 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
@@ -51,17 +51,13 @@ public class AbstractConnectionManager {
 		}
 	}
 
-	public static Pair<InputStream,Integer> createInputStream(DownloadableFile file, boolean gcm) {
+	public static Pair<InputStream,Integer> createInputStream(DownloadableFile file, boolean gcm) throws FileNotFoundException {
 		FileInputStream is;
 		int size;
-		try {
-			is = new FileInputStream(file);
-			size = (int) file.getSize();
-			if (file.getKey() == null) {
-				return new Pair<InputStream,Integer>(is,size);
-			}
-		} catch (FileNotFoundException e) {
-			return null;
+		is = new FileInputStream(file);
+		size = (int) file.getSize();
+		if (file.getKey() == null) {
+			return new Pair<InputStream,Integer>(is,size);
 		}
 		try {
 			if (gcm) {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ffe587d6..ed3bb879 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -404,8 +404,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
-	public void attachImageToConversation(final Conversation conversation,
-			final Uri uri, final UiCallback<Message> callback) {
+	public void attachImageToConversation(final Conversation conversation, final Uri uri, final UiCallback<Message> callback) {
+		if (getFileBackend().useImageAsIs(uri)) {
+			Log.d(Config.LOGTAG,"using image as is");
+			attachFileToConversation(conversation, uri, callback);
+			return;
+		}
 		final Message message;
 		if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
 			message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
@@ -855,7 +859,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		} else {
 			Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetching roster");
 		}
-		iqPacket.query(Xmlns.ROSTER).setAttribute("ver",account.getRosterVersion());
+		iqPacket.query(Xmlns.ROSTER).setAttribute("ver", account.getRosterVersion());
 		sendIqPacket(account,iqPacket,mIqParser);
 	}
 
@@ -1000,6 +1004,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			public void onMessageFound(Message message) {
 				if (!getFileBackend().isFileAvailable(message)) {
 					message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
+					final int s = message.getStatus();
+					if(s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
+						markMessage(message,Message.STATUS_SEND_FAILED);
+					}
 				}
 			}
 		});
@@ -1011,7 +1019,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			if (message != null) {
 				if (!getFileBackend().isFileAvailable(message)) {
 					message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
-					updateConversationUi();
+					final int s = message.getStatus();
+					if(s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
+						markMessage(message,Message.STATUS_SEND_FAILED);
+					} else {
+						updateConversationUi();
+					}
 				}
 				return;
 			}