From 754de6bb0449a577d2bb9c28cca6adf0ef9554f6 Mon Sep 17 00:00:00 2001 From: steckbrief Date: Mon, 6 Feb 2017 10:01:13 +0100 Subject: relates FS#241: Implementation of http download based on okhttp --- .../thedevstack/conversationsplus/entities/FileParams.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java') diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java b/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java index 7d5741d9..b21472ba 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/FileParams.java @@ -1,6 +1,7 @@ package de.thedevstack.conversationsplus.entities; import de.thedevstack.conversationsplus.enums.FileStatus; +import de.thedevstack.conversationsplus.utils.FileUtils; import de.thedevstack.conversationsplus.utils.MimeUtils; /** @@ -12,7 +13,7 @@ public class FileParams { private String path; private String url; private String mimeType; - private long size = 0; + private long size = -1; private int width = 0; private int height = 0; private FileStatus fileStatus; @@ -136,15 +137,12 @@ public class FileParams { path = (!path.endsWith(this.name)) ? path + "/" + this.name : path; } else { if (!path.endsWith("/")) { - this.setName(path.substring(path.lastIndexOf('/') + 1)); + this.setName(FileUtils.getFilenameFromPath(path)); } } if (null == this.mimeType) { - int start = path.lastIndexOf('.') + 1; - if (start < path.length()) { - String extension = path.substring(start); - this.mimeType = MimeUtils.guessMimeTypeFromExtension(extension); - } + String extension = FileUtils.getLastExtension(path); + this.mimeType = MimeUtils.guessMimeTypeFromExtension(extension); } } @@ -152,7 +150,7 @@ public class FileParams { } public boolean isRemoteAvailable() { - return null != this.url || FileStatus.UPLOADED == this.fileStatus || FileStatus.DELETE_FAILED == this.fileStatus; + return (null != this.url || FileStatus.UPLOADED == this.fileStatus || FileStatus.DELETE_FAILED == this.fileStatus) && FileStatus.NOT_FOUND != this.fileStatus; } public void setFileStatus(FileStatus fileStatus) { -- cgit v1.2.3