Merge branch 'master' of github.com:owncloud/android into setAsWallpaper

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / ThumbnailsCacheManager.java

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 87fa43f..f0ecf76 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -22,18 +22,20 @@
 package com.owncloud.android.datamodel;
 
 import java.io.File;
 package com.owncloud.android.datamodel;
 
 import java.io.File;

+import java.io.InputStream;

 import java.lang.ref.WeakReference;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 
 import android.accounts.Account;
 import java.lang.ref.WeakReference;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 
 import android.accounts.Account;

-import android.accounts.AccountManager;

 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;

+import android.graphics.Canvas;

 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.BitmapDrawable;

+import android.graphics.drawable.ColorDrawable;

 import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;


@@ -42,10 +44,10 @@ import android.widget.ImageView;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;

+import com.owncloud.android.authentication.AccountUtils;

 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;

-import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;

 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;


@@ -60,8 +62,7 @@ public class ThumbnailsCacheManager {
     private static final String TAG = ThumbnailsCacheManager.class.getSimpleName();
     
     private static final String CACHE_FOLDER = "thumbnailCache";
     private static final String TAG = ThumbnailsCacheManager.class.getSimpleName();
     
     private static final String CACHE_FOLDER = "thumbnailCache";

-    private static final String MINOR_SERVER_VERSION_FOR_THUMBS = "7.8.0";
-    
+

     private static final Object mThumbnailsDiskCacheLock = new Object();
     private static DiskLruImageCache mThumbnailCache = null;
     private static boolean mThumbnailCacheStarting = true;
     private static final Object mThumbnailsDiskCacheLock = new Object();
     private static DiskLruImageCache mThumbnailCache = null;
     private static boolean mThumbnailCacheStarting = true;


@@ -70,12 +71,11 @@ public class ThumbnailsCacheManager {
     private static final CompressFormat mCompressFormat = CompressFormat.JPEG;
     private static final int mCompressQuality = 70;
     private static OwnCloudClient mClient = null;
     private static final CompressFormat mCompressFormat = CompressFormat.JPEG;
     private static final int mCompressQuality = 70;
     private static OwnCloudClient mClient = null;

-    private static String mServerVersion = null;

 
     public static Bitmap mDefaultImg = 
             BitmapFactory.decodeResource(
 
     public static Bitmap mDefaultImg = 
             BitmapFactory.decodeResource(

-                    MainApp.getAppContext().getResources(), 
-                    DisplayUtils.getFileTypeIconId("image/png", "default.png")
+                    MainApp.getAppContext().getResources(),
+                    R.drawable.file_image

             );
 
     
             );
 
     


@@ -129,10 +129,12 @@ public class ThumbnailsCacheManager {
             while (mThumbnailCacheStarting) {
                 try {
                     mThumbnailsDiskCacheLock.wait();
             while (mThumbnailCacheStarting) {
                 try {
                     mThumbnailsDiskCacheLock.wait();

-                } catch (InterruptedException e) {}
+                } catch (InterruptedException e) {
+                    Log_OC.e(TAG, "Wait in mThumbnailsDiskCacheLock was interrupted", e);
+                }

             }
             if (mThumbnailCache != null) {
             }
             if (mThumbnailCache != null) {

-                return (Bitmap) mThumbnailCache.getBitmap(key);
+                return mThumbnailCache.getBitmap(key);

             }
         }
         return null;
             }
         }
         return null;


@@ -145,7 +147,8 @@ public class ThumbnailsCacheManager {
         private FileDataStorageManager mStorageManager;
 
 
         private FileDataStorageManager mStorageManager;
 
 

-        public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager, Account account) {
+        public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager,
+                                       Account account) {

             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<ImageView>(imageView);
             if (storageManager == null)
             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<ImageView>(imageView);
             if (storageManager == null)


@@ -165,10 +168,8 @@ public class ThumbnailsCacheManager {
 
             try {
                 if (mAccount != null) {
 
             try {
                 if (mAccount != null) {

-                    AccountManager accountMgr = AccountManager.get(MainApp.getAppContext());
-
-                    mServerVersion = accountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION);
-                    OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, MainApp.getAppContext());
+                    OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount,
+                            MainApp.getAppContext());

                     mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                             getClientFor(ocAccount, MainApp.getAppContext());
                 }
                     mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                             getClientFor(ocAccount, MainApp.getAppContext());
                 }


@@ -179,8 +180,7 @@ public class ThumbnailsCacheManager {
                     thumbnail = doOCFileInBackground();
                 }  else if (mFile instanceof File) {
                     thumbnail = doFileInBackground();
                     thumbnail = doOCFileInBackground();
                 }  else if (mFile instanceof File) {
                     thumbnail = doFileInBackground();

-                } else {
-                    // do nothing
+                //} else {  do nothing

                 }
 
                 }catch(Throwable t){
                 }
 
                 }catch(Throwable t){


@@ -195,19 +195,15 @@ public class ThumbnailsCacheManager {
         }
 
         protected void onPostExecute(Bitmap bitmap){
         }
 
         protected void onPostExecute(Bitmap bitmap){

-            if (isCancelled()) {
-                bitmap = null;
-            }
-
-            if (mImageViewReference != null && bitmap != null) {
+            if (bitmap != null) {

                 final ImageView imageView = mImageViewReference.get();
                 final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
                 final ImageView imageView = mImageViewReference.get();
                 final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);

-                if (this == bitmapWorkerTask && imageView != null) {
+                if (this == bitmapWorkerTask) {

                     String tagId = "";
                     if (mFile instanceof OCFile){
                         tagId = String.valueOf(((OCFile)mFile).getFileId());
                     } else if (mFile instanceof File){
                     String tagId = "";
                     if (mFile instanceof OCFile){
                         tagId = String.valueOf(((OCFile)mFile).getFileId());
                     } else if (mFile instanceof File){

-                        tagId = String.valueOf(((File)mFile).hashCode());
+                        tagId = String.valueOf(mFile.hashCode());

                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
                         imageView.setImageBitmap(bitmap);
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
                         imageView.setImageBitmap(bitmap);


@@ -244,17 +240,16 @@ public class ThumbnailsCacheManager {
         private int getThumbnailDimension(){
             // Converts dp to pixel
             Resources r = MainApp.getAppContext().getResources();
         private int getThumbnailDimension(){
             // Converts dp to pixel
             Resources r = MainApp.getAppContext().getResources();

-            return (int) Math.round(r.getDimension(R.dimen.file_icon_size_grid));
+            return Math.round(r.getDimension(R.dimen.file_icon_size_grid));

         }
 
         private Bitmap doOCFileInBackground() {
         }
 
         private Bitmap doOCFileInBackground() {

-            Bitmap thumbnail = null;

             OCFile file = (OCFile)mFile;
 
             final String imageKey = String.valueOf(file.getRemoteId());
 
             // Check disk cache in background thread
             OCFile file = (OCFile)mFile;
 
             final String imageKey = String.valueOf(file.getRemoteId());
 
             // Check disk cache in background thread

-            thumbnail = getBitmapFromDiskCache(imageKey);
+            Bitmap thumbnail = getBitmapFromDiskCache(imageKey);

 
             // Not found in disk cache
             if (thumbnail == null || file.needsUpdateThumbnail()) {
 
             // Not found in disk cache
             if (thumbnail == null || file.needsUpdateThumbnail()) {


@@ -262,10 +257,16 @@ public class ThumbnailsCacheManager {
                 int px = getThumbnailDimension();
 
                 if (file.isDown()) {
                 int px = getThumbnailDimension();
 
                 if (file.isDown()) {

-                    Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
+                    Bitmap temp = BitmapUtils.decodeSampledBitmapFromFile(

                             file.getStoragePath(), px, px);
                             file.getStoragePath(), px, px);

+                    Bitmap bitmap = ThumbnailUtils.extractThumbnail(temp, px, px);

 
                     if (bitmap != null) {
 
                     if (bitmap != null) {

+                        // Handle PNG
+                        if (file.getMimetype().equalsIgnoreCase("image/png")) {
+                            bitmap = handlePNG(bitmap, px);
+                        }
+

                         thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), px);
 
                         file.setNeedsUpdateThumbnail(false);
                         thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), px);
 
                         file.setNeedsUpdateThumbnail(false);


@@ -274,22 +275,26 @@ public class ThumbnailsCacheManager {
 
                 } else {
                     // Download thumbnail from server
 
                 } else {
                     // Download thumbnail from server

-                    if (mClient != null && mServerVersion != null) {
-                        OwnCloudVersion serverOCVersion = new OwnCloudVersion(mServerVersion);
-                        if (serverOCVersion.compareTo(new OwnCloudVersion(MINOR_SERVER_VERSION_FOR_THUMBS)) >= 0) {
+                    OwnCloudVersion serverOCVersion = AccountUtils.getServerVersion(mAccount);
+                    if (mClient != null && serverOCVersion != null) {
+                        if (serverOCVersion.supportsRemoteThumbnails()) {

                             try {
                             try {

-                                int status = -1;
-
-                                String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +
+                                String uri = mClient.getBaseUri() + "" +
+                                        "/index.php/apps/files/api/v1/thumbnail/" +

                                         px + "/" + px + Uri.encode(file.getRemotePath(), "/");
                                 Log_OC.d("Thumbnail", "URI: " + uri);
                                 GetMethod get = new GetMethod(uri);
                                         px + "/" + px + Uri.encode(file.getRemotePath(), "/");
                                 Log_OC.d("Thumbnail", "URI: " + uri);
                                 GetMethod get = new GetMethod(uri);

-                                status = mClient.executeMethod(get);
+                                int status = mClient.executeMethod(get);

                                 if (status == HttpStatus.SC_OK) {
                                 if (status == HttpStatus.SC_OK) {

-                                    byte[] bytes = get.getResponseBody();
-                                    Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+                                    InputStream inputStream = get.getResponseBodyAsStream();
+                                    Bitmap bitmap = BitmapFactory.decodeStream(inputStream);

                                     thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
 
                                     thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
 

+                                    // Handle PNG
+                                    if (file.getMimetype().equalsIgnoreCase("image/png")) {
+                                        thumbnail = handlePNG(thumbnail, px);
+                                    }
+

                                     // Add thumbnail to cache
                                     if (thumbnail != null) {
                                         addBitmapToCache(imageKey, thumbnail);
                                     // Add thumbnail to cache
                                     if (thumbnail != null) {
                                         addBitmapToCache(imageKey, thumbnail);


@@ -309,14 +314,26 @@ public class ThumbnailsCacheManager {
 
         }
 
 
         }
 

+        private Bitmap handlePNG(Bitmap bitmap, int px){
+            Bitmap resultBitmap = Bitmap.createBitmap(px,
+                    px,
+                    Bitmap.Config.ARGB_8888);
+            Canvas c = new Canvas(resultBitmap);
+
+            c.drawColor(MainApp.getAppContext().getResources().
+                    getColor(R.color.background_color));
+            c.drawBitmap(bitmap, 0, 0, null);
+
+            return resultBitmap;
+        }
+

         private Bitmap doFileInBackground() {
         private Bitmap doFileInBackground() {

-            Bitmap thumbnail = null;

             File file = (File)mFile;
 
             final String imageKey = String.valueOf(file.hashCode());
 
             // Check disk cache in background thread
             File file = (File)mFile;
 
             final String imageKey = String.valueOf(file.hashCode());
 
             // Check disk cache in background thread

-            thumbnail = getBitmapFromDiskCache(imageKey);
+            Bitmap thumbnail = getBitmapFromDiskCache(imageKey);

 
             // Not found in disk cache
             if (thumbnail == null) {
 
             // Not found in disk cache
             if (thumbnail == null) {


@@ -344,6 +361,7 @@ public class ThumbnailsCacheManager {
             if (bitmapData == null || bitmapData != file) {
                 // Cancel previous task
                 bitmapWorkerTask.cancel(true);
             if (bitmapData == null || bitmapData != file) {
                 // Cancel previous task
                 bitmapWorkerTask.cancel(true);

+                Log_OC.v(TAG, "Cancelled generation of thumbnail for a reused imageView");

             } else {
                 // The same work is already in progress
                 return false;
             } else {
                 // The same work is already in progress
                 return false;