From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 14 Aug 2015 13:39:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail
X-Git-Tag: beta-20151202~1^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c50aa8bc2ad90bad0e1f97a3a7bab461dc05b0d1

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

c50aa8bc2ad90bad0e1f97a3a7bab461dc05b0d1
diff --cc owncloud-android-library
index f5fbca24,dbc8c325..4eb9ce4b
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f5fbca24becbb01660abe2a7013c1b536ea8a301
 -Subproject commit dbc8c325d74f3f7e8da8236c5abe77a141ae4019
++Subproject commit 4eb9ce4ba2d9272de561954b3638f5acde8b2ca5
diff --cc res/drawable-hdpi/view_play.png
index 00000000,57c9fa54..53717245
mode 000000,100644..100644
Binary files differ
diff --cc res/drawable-mdpi/view_play.png
index 00000000,c61e948b..77b20272
mode 000000,100644..100644
Binary files differ
diff --cc res/drawable-xhdpi/view_play.png
index 00000000,a3c80e73..8482788e
mode 000000,100644..100644
Binary files differ
diff --cc res/drawable-xxhdpi/view_play.png
index 00000000,547ef30a..fea738b9
mode 000000,100644..100644
Binary files differ
diff --cc res/drawable-xxxhdpi/view_play.png
index 00000000,be5c062b..3786b4d0
mode 000000,100644..100644
Binary files differ
diff --cc src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 0e59a834,07849e18..5806a408
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@@ -51,6 -55,6 +55,7 @@@ import com.owncloud.android.lib.resourc
  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.
@@@ -176,8 -180,20 +181,19 @@@ public class ThumbnailsCacheManager 
                  
                  if (mFile instanceof OCFile) {
                      thumbnail = doOCFileInBackground();
+ 
+                     if (((OCFile) mFile).isVideo()){
+                         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/")){
+                         thumbnail = addVideoOverlay(thumbnail);
+                     }
                  //} else {  do nothing
                  }
  
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index a589512e,5c0e8e8c..26d77db5
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -308,19 -316,20 +316,17 @@@ public class FileListListAdapter extend
                                      new ThumbnailsCacheManager.ThumbnailGenerationTask(
                                              fileIcon, mStorageManager, mAccount
                                              );
-                             if (thumbnail != null) {
-                                 final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
-                                         new ThumbnailsCacheManager.AsyncDrawable(
-                                                 mContext.getResources(),
-                                                 thumbnail,
-                                                 task
-                                         );
-                                 fileIcon.setImageDrawable(asyncDrawable);
-                                 task.execute(file);
-                             } else {
-                                 fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(
-                                         file.getMimetype(), file.getFileName()));
+                             if (thumbnail == null) {
 -//                                thumbnail = ThumbnailsCacheManager.mDefaultImg;
 -                                Integer id = DisplayUtils.getFileTypeIconId(file.getMimetype(),
 -                                        file.getFileName());
 -                                thumbnail = BitmapFactory.decodeResource(mContext.getResources(), id);
++                                thumbnail = ThumbnailsCacheManager.mDefaultImg;
                              }
+                             final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
+                                     new ThumbnailsCacheManager.AsyncDrawable(
 -                                    mContext.getResources(),
 -                                    thumbnail,
++                                    mContext.getResources(), 
++                                    thumbnail, 
+                                     task
+                                     );
+                             fileIcon.setImageDrawable(asyncDrawable);
+                             task.execute(file);
                          }
                      }
                  } else {