diff options
author | steckbrief <steckbrief@chefmail.de> | 2017-07-31 08:44:32 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2017-07-31 08:44:32 +0200 |
commit | 11e2b1accd933eb9fcb4477a60dd0864d9f72a67 (patch) | |
tree | e1d27c488d5a697557095add001dca868f523ef4 /src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java | |
parent | 2d41916750e2c31b57cf6325441ff37a8639fe93 (diff) |
Implements FS#245: Implement FiletransferHttp (upload and delete), some minor bug fixes including to fail a JingleTransfer in case criterias are not met
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java index e0d627b9..5e629485 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java @@ -181,6 +181,7 @@ public final class MessageUtil { switch (message.getStatus()) { case Message.STATUS_SEND: case Message.STATUS_SEND_DISPLAYED: + case Message.STATUS_SEND_FAILED: case Message.STATUS_SEND_RECEIVED: return true; default: @@ -283,7 +284,7 @@ public final class MessageUtil { fileParams.setHeight(imageHeight); } String relativeFilePathFromMessage = message.getRelativeFilePath(); - if (null != relativeFilePathFromMessage && relativeFilePathFromMessage.startsWith("/")) { + if (null != relativeFilePathFromMessage && relativeFilePathFromMessage.startsWith("/") && (null == fileParams.getPath() || !relativeFilePathFromMessage.equals(fileParams.getPath()))) { fileParams.setPath(relativeFilePathFromMessage); } } |