avoid NPE

owncloud · Aug 22, 2016 · 7068445 · 7068445
1 parent 174b0ea
commit 7068445
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -184,7 +184,7 @@ protected Bitmap doInBackground(Object... params) {
                 if (mFile instanceof OCFile) {
                     thumbnail = doOCFileInBackground();
 
-                    if (((OCFile) mFile).isVideo()){
+                    if (((OCFile) mFile).isVideo() && thumbnail != null){
                         thumbnail = addVideoOverlay(thumbnail);
                     }
                 }  else if (mFile instanceof File) {
@@ -194,7 +194,7 @@ protected Bitmap doInBackground(Object... params) {
                     FileNameMap fileNameMap = URLConnection.getFileNameMap();
                     String mMimeType = fileNameMap.getContentTypeFor("file://" + url);
 
-                    if (mMimeType != null && mMimeType.startsWith("video/")){
+                    if (mMimeType != null && mMimeType.startsWith("video/") && thumbnail != null){
                         thumbnail = addVideoOverlay(thumbnail);
                     }
                 //} else {  do nothing