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

diff --git a/owncloud-android-library b/owncloud-android-library
index dbc8c32..4eb9ce4 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit dbc8c325d74f3f7e8da8236c5abe77a141ae4019
+Subproject commit 4eb9ce4ba2d9272de561954b3638f5acde8b2ca5

diff --git a/res/drawable-hdpi/view_play.png b/res/drawable-hdpi/view_play.png
index 57c9fa5..5371724 100644 (file)
Binary files a/res/drawable-hdpi/view_play.png and b/res/drawable-hdpi/view_play.png differ

diff --git a/res/drawable-mdpi/view_play.png b/res/drawable-mdpi/view_play.png
index c61e948..77b2027 100644 (file)
Binary files a/res/drawable-mdpi/view_play.png and b/res/drawable-mdpi/view_play.png differ

diff --git a/res/drawable-xhdpi/view_play.png b/res/drawable-xhdpi/view_play.png
index a3c80e7..8482788 100644 (file)
Binary files a/res/drawable-xhdpi/view_play.png and b/res/drawable-xhdpi/view_play.png differ

diff --git a/res/drawable-xxhdpi/view_play.png b/res/drawable-xxhdpi/view_play.png
index 547ef30..fea738b 100644 (file)
Binary files a/res/drawable-xxhdpi/view_play.png and b/res/drawable-xxhdpi/view_play.png differ

diff --git a/res/drawable-xxxhdpi/view_play.png b/res/drawable-xxxhdpi/view_play.png
index be5c062..3786b4d 100644 (file)
Binary files a/res/drawable-xxxhdpi/view_play.png and b/res/drawable-xxxhdpi/view_play.png differ

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 07849e1..5806a40 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.utils.FileStorageUtils;
 
 /**
  * Manager for concurrent access to thumbnails cache.
@@ -188,8 +189,7 @@ public class ThumbnailsCacheManager {
                     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);

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 5c0e8e8..26d77db 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -317,15 +317,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                                             fileIcon, mStorageManager, mAccount\r
                                             );\r
                             if (thumbnail == null) {\r
-//                                thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
-                                Integer id = DisplayUtils.getFileTypeIconId(file.getMimetype(),\r
-                                        file.getFileName());\r
-                                thumbnail = BitmapFactory.decodeResource(mContext.getResources(), id);\r
+                                thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
                             }\r
                             final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =\r
                                     new ThumbnailsCacheManager.AsyncDrawable(\r
-                                    mContext.getResources(),\r
-                                    thumbnail,\r
+                                    mContext.getResources(), \r
+                                    thumbnail, \r
                                     task\r
                                     );\r
                             fileIcon.setImageDrawable(asyncDrawable);\r