aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2018-02-16 21:04:29 +0100
committersteckbrief <steckbrief@chefmail.de>2018-02-16 21:04:29 +0100
commit62bc6885db07423a434f945de9def863cb12b8c1 (patch)
tree0d60daca06a78d11546c02083c29f826581ae179 /src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
parent84a2f8e41ac4d5a7ebc24f4eb5b99e9bc3029f1f (diff)
introduces cancel status for file transfers, fixes NPE in file sharing after picture resize
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
index b99f8d82..63f1547f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java
@@ -134,7 +134,7 @@ public class FileTransferManager implements FileTransferStatusListener {
@Override
public void onCancel(FileTransferEntity entity) {
this.activeTransfers.remove(entity.getMessage().getUuid());
- MessageUtil.markMessage(entity.getMessage(), Message.STATUS_SEND_FAILED); // TODO New Status CANCELED!
+ MessageUtil.markMessage(entity.getMessage(), Message.STATUS_SEND_CANCELED);
}
@Override