add error message to failed messages. accessible via context menu

1 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
index d12dde80e..95f840d67 100644
--- a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
+++ b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
@@ -20,6 +20,7 @@ import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.DownloadableFile;
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.entities.Transferable;
+import de.pixart.messenger.parser.IqParser;
 import de.pixart.messenger.persistance.FileBackend;
 import de.pixart.messenger.services.AbstractConnectionManager;
 import de.pixart.messenger.services.XmppConnectionService;
@@ -86,10 +87,10 @@ public class HttpUploadConnection implements Transferable {
 		this.canceled = true;
 	}
 
-	private void fail() {
+    private void fail(String errorMessage) {
 		mHttpConnectionManager.finishUploadConnection(this);
 		message.setTransferable(null);
-        mXmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED);
+        mXmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED, errorMessage);
         FileBackend.close(mFileInputStream);
 	}
 
@@ -111,7 +112,7 @@ public class HttpUploadConnection implements Transferable {
 			pair = AbstractConnectionManager.createInputStream(file, true);
 		} catch (FileNotFoundException e) {
 			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not find file to upload - "+e.getMessage());
-			fail();
+			fail(e.getMessage());
 			return;
 		}
 		if (pair != null) {
@@ -139,7 +140,7 @@ public class HttpUploadConnection implements Transferable {
 					}
 				}
 				Log.d(Config.LOGTAG,account.getJid().toString()+": invalid response to slot request "+packet);
-				fail();
+                fail(IqParser.extractErrorMessage(packet));
 			}
 		});
 		message.setTransferable(this);
@@ -208,12 +209,12 @@ public class HttpUploadConnection implements Transferable {
 							@Override
 							public void error(int errorCode, Message object) {
 								Log.d(Config.LOGTAG,"pgp encryption failed");
-								fail();
+                                fail("pgp encryption failed");
 							}
 
 							@Override
 							public void userInputRequried(PendingIntent pi, Message object) {
-								fail();
+                                fail("pgp encryption failed");
 							}
 						});
 					} else {
@@ -221,12 +222,12 @@ public class HttpUploadConnection implements Transferable {
 					}
 				} else {
 					Log.d(Config.LOGTAG,"http upload failed because response code was "+code);
-					fail();
+                    fail("http upload failed because response code was "+code);
 				}
 			} catch (IOException e) {
 				e.printStackTrace();
 				Log.d(Config.LOGTAG,"http upload failed "+e.getMessage());
-				fail();
+				fail(e.getMessage());
 			} finally {
 				FileBackend.close(mFileInputStream);
 				FileBackend.close(os);