1 files changed, 5 insertions, 7 deletions
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,23 +137,20 @@ 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);
+                String extension = FileUtils.getLastExtension(path);
                 this.mimeType = MimeUtils.guessMimeTypeFromExtension(extension);
             }
         }
-        }
 
         this.path = path;
     }
 
     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) {