Jelajahi Sumber

Check for right media type

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
Jonas Mayer 11 bulan lalu
induk
melakukan
700dd54014

+ 7 - 1
app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java

@@ -12,7 +12,9 @@ package com.owncloud.android.datamodel;
 
 import com.nextcloud.client.preferences.SubFolderRule;
 import com.owncloud.android.files.services.NameCollisionPolicy;
+import com.owncloud.android.utils.MimeTypeUtil;
 
+import java.io.File;
 import java.io.Serializable;
 
 /**
@@ -275,7 +277,11 @@ public class SyncedFolder implements Serializable, Cloneable {
     }
 
     public boolean containsFile(String filePath){
-        return filePath.contains(localPath);
+        boolean isCorrectMediaType =
+                (getType() == MediaFolderType.IMAGE && MimeTypeUtil.isImage(new File(filePath))) ||
+                (getType() == MediaFolderType.VIDEO && MimeTypeUtil.isVideo(new File(filePath))) ||
+                getType() == MediaFolderType.CUSTOM;
+        return filePath.contains(localPath) && isCorrectMediaType;
     }
 
     public long getLastScanTimestampMs() { return lastScanTimestampMs; }