From 62bc6885db07423a434f945de9def863cb12b8c1 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Fri, 16 Feb 2018 21:04:29 +0100 Subject: introduces cancel status for file transfers, fixes NPE in file sharing after picture resize --- .../conversationsplus/services/filetransfer/FileTransferManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/thedevstack/conversationsplus/services/filetransfer/FileTransferManager.java') 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 -- cgit v1.2.3