avoid NPE

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / ThumbnailsCacheManager.java

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 07849e1..68910a2 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -55,6 +55,7 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;

+import com.owncloud.android.utils.FileStorageUtils;

 
 /**
  * Manager for concurrent access to thumbnails cache.
 
 /**
  * Manager for concurrent access to thumbnails cache.


@@ -181,17 +182,16 @@ public class ThumbnailsCacheManager {
                 if (mFile instanceof OCFile) {
                     thumbnail = doOCFileInBackground();
 
                 if (mFile instanceof OCFile) {
                     thumbnail = doOCFileInBackground();
 

-                    if (((OCFile) mFile).isVideo()){
+                    if (((OCFile) mFile).isVideo() && thumbnail != null){

                         thumbnail = addVideoOverlay(thumbnail);
                     }
                 }  else if (mFile instanceof File) {
                     thumbnail = doFileInBackground();
 
                     String url = ((File) mFile).getAbsolutePath();
                         thumbnail = addVideoOverlay(thumbnail);
                     }
                 }  else if (mFile instanceof File) {
                     thumbnail = doFileInBackground();
 
                     String url = ((File) mFile).getAbsolutePath();

-                    FileNameMap fileNameMap = URLConnection.getFileNameMap();
-                    String mMimeType = fileNameMap.getContentTypeFor("file://" + url);
+                    String mMimeType = FileStorageUtils.getMimeTypeFromName(url);

 
 

-                    if (mMimeType != null && mMimeType.startsWith("video/")){
+                    if (mMimeType != null && mMimeType.startsWith("video/") && thumbnail != null){

                         thumbnail = addVideoOverlay(thumbnail);
                     }
                 //} else {  do nothing
                         thumbnail = addVideoOverlay(thumbnail);
                     }
                 //} else {  do nothing