From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Dec 2015 19:29:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
X-Git-Tag: beta-20151202~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4246701891d4f6e412e98bbba25be1c50b4e3e23

Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
---

4246701891d4f6e412e98bbba25be1c50b4e3e23
diff --cc src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index b9087bcc,68910a28..c8a06ca2
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@@ -233,13 -178,11 +233,13 @@@ public class ThumbnailsCacheManager 
                  }
  
                  mFile = params[0];
 +                mIsThumbnail = (Boolean) params[1];
 +
                  
                  if (mFile instanceof OCFile) {
 -                    thumbnail = doOCFileInBackground();
 +                    thumbnail = doOCFileInBackground(mIsThumbnail);
  
-                     if (((OCFile) mFile).isVideo()){
+                     if (((OCFile) mFile).isVideo() && thumbnail != null){
                          thumbnail = addVideoOverlay(thumbnail);
                      }
                  }  else if (mFile instanceof File) {