diff options
author | steckbrief <steckbrief@chefmail.de> | 2018-02-16 21:04:29 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2018-02-16 21:04:29 +0100 |
commit | 62bc6885db07423a434f945de9def863cb12b8c1 (patch) | |
tree | 0d60daca06a78d11546c02083c29f826581ae179 /src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java | |
parent | 84a2f8e41ac4d5a7ebc24f4eb5b99e9bc3029f1f (diff) |
introduces cancel status for file transfers, fixes NPE in file sharing after picture resize
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java | 6 |
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; |