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 --- .../java/de/thedevstack/conversationsplus/utils/MessageUtil.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java') diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java index fa403cc5..2e346486 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java @@ -50,6 +50,7 @@ public final class MessageUtil { URL url = new URL(body); if (!url.getProtocol().equalsIgnoreCase("http") && !url.getProtocol().equalsIgnoreCase("https")) { message.setTreatAsDownloadable(Message.Decision.NEVER); + fileParams.setFileStatus(FileStatus.UNDEFINED); return; } String extension = FileUtils.getRelevantExtension(url); @@ -69,6 +70,7 @@ public final class MessageUtil { if (extension == null) { message.setTreatAsDownloadable(Message.Decision.NEVER); + fileParams.setFileStatus(FileStatus.UNDEFINED); return; } byte[] ivAndKey = UrlUtil.getIvAndKeyFromURL(url); @@ -79,12 +81,14 @@ public final class MessageUtil { fileParams.setKeyAndIv(ivAndKey); } else { message.setTreatAsDownloadable(Message.Decision.NEVER); + fileParams.setFileStatus(FileStatus.UNDEFINED); } } else if (Transferable.VALID_IMAGE_EXTENSIONS.contains(extension) || Transferable.WELL_KNOWN_EXTENSIONS.contains(extension)) { message.setTreatAsDownloadable(Message.Decision.SHOULD); } else { message.setTreatAsDownloadable(Message.Decision.NEVER); + fileParams.setFileStatus(FileStatus.UNDEFINED); } if (message.treatAsDownloadable() == Message.Decision.MUST @@ -94,6 +98,7 @@ public final class MessageUtil { } } catch (MalformedURLException e) { message.setTreatAsDownloadable(Message.Decision.NEVER); + fileParams.setFileStatus(FileStatus.UNDEFINED); } } -- cgit v1.2.3