From: masensio <masensio@solidgear.es>
Date: Thu, 15 Oct 2015 14:10:55 +0000 (+0200)
Subject: Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detai... 
X-Git-Tag: oc-android-1.9^2~50^2~1^2^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1f964a79ddb432dbba44198d20a77d6a3d1f9600?ds=inline;hp=--cc

Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail

Conflicts:
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
---

1f964a79ddb432dbba44198d20a77d6a3d1f9600
diff --cc src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index d4b1ffdd,4c324d80..f87ee0a0
mode 100644,100755..100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@@ -21,7 -21,11 +21,9 @@@
   */
  package com.owncloud.android.ui.fragment;
  
 -import java.lang.ref.WeakReference;
 -
  import android.accounts.Account;
 -import android.content.Intent;
++
+ import android.graphics.Bitmap;
  import android.os.Bundle;
  import android.view.LayoutInflater;
  import android.view.Menu;
@@@ -336,10 -342,10 +339,10 @@@ public class FileDetailFragment extend
                  setFile(storageManager.getFileByPath(getFile().getRemotePath()));
              }
              OCFile file = getFile();
 -            
 +
              // set file details
              setFilename(file.getFileName());
-             setFiletype(file.getMimetype(), file.getFileName());
+             setFiletype(file);
              setFilesize(file.getFileLength());
  
              setTimeModified(file.getModificationTimestamp());
@@@ -404,7 -409,19 +408,19 @@@
          }
          ImageView iv = (ImageView) getView().findViewById(R.id.fdIcon);
          if (iv != null) {
-             iv.setImageResource(MimetypeIconUtil.getFileTypeIconId(mimetype, filename));
+ 			Bitmap thumbnail = null;
+             if (file.isImage()) {
+                 String tagId = String.valueOf(file.getRemoteId());
+                 thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId);
+ 			}
+ 			if (thumbnail != null) {
+ 				// Display thumbnail
+ 				iv.setImageBitmap(thumbnail);
+ 			} else {
+ 				// Name of the file, to deduce the icon to use in case the MIME type is not precise enough
+ 				String filename = file.getFileName();
 -				iv.setImageResource(DisplayUtils.getFileTypeIconId(mimetype, filename));
++                iv.setImageResource(MimetypeIconUtil.getFileTypeIconId(mimetype, filename));
+ 			}
          }
      }