introduces cancel status for file transfers, fixes NPE in file sharing after picture resize

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
index ea93fdb8..49a10684 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
@@ -57,6 +57,7 @@ public class JingleConnection implements Transferable {
 
 	private int mJingleStatus = -1;
 	private int mStatus = Transferable.STATUS_UNKNOWN;
+	private boolean canceled;
 	private Message message;
 	private String sessionId;
 	private Account account;
@@ -834,6 +835,7 @@ public class JingleConnection implements Transferable {
 	}
 
 	private void sendCancel() {
+	    this.canceled = true;
 		JinglePacket packet = bootstrapPacket("session-terminate");
 		Reason reason = new Reason();
 		reason.addChild("cancel");
@@ -1018,6 +1020,10 @@ public class JingleConnection implements Transferable {
 		}
 	}
 
+	public boolean isCanceled() {
+	    return this.canceled;
+    }
+
 	@Override
 	public int getProgress() {
 		return this.mProgress;