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 584fbc0..f0ecf76 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -1,5 +1,9 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2014 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Tobias Kaminsky
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -18,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;


@@ -38,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;


@@ -49,18 +55,14 @@ import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;
 
 /**
 import com.owncloud.android.utils.DisplayUtils;
 
 /**

- * Manager for concurrent access to thumbnails cache. 
- *  
- * @author Tobias Kaminsky
- * @author David A. Velasco
+ * Manager for concurrent access to thumbnails cache.

  */
 public class ThumbnailsCacheManager {
     
     private static final String TAG = ThumbnailsCacheManager.class.getSimpleName();
     
     private static final String CACHE_FOLDER = "thumbnailCache";
  */
 public class ThumbnailsCacheManager {
     
     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;


@@ -69,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.getResourceId("image/png", "default.png")
+                    MainApp.getAppContext().getResources(),
+                    R.drawable.file_image

             );
 
     
             );
 
     


@@ -128,134 +129,26 @@ 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;
     }
 

-    public interface AsyncTaskFile {
-        public String getId();
-        public String getTagId();
-        public String getPath();
-        public String getRemotePath();
-        public boolean getNeedsUpdateThumbnail();
-        public void setNeedsUpdateThumbnail(boolean needsUpdate);
-        public boolean getIsDown();
-        public Object getFile();
-    }
-
-    public static class AsyncTaskFileLocal implements AsyncTaskFile{
-
-        private File mFile;
-        private boolean mNeedsUpdate;
-
-        public AsyncTaskFileLocal(File file){
-            mFile = file;
-            mNeedsUpdate = false;
-        }
-
-        @Override
-         public String getId() {
-            return String.valueOf(mFile.hashCode());
-        }
-
-        @Override
-        public String getTagId() {
-            return String.valueOf(mFile.hashCode());
-        }
-
-        @Override
-        public String getPath() {
-            return mFile.getAbsolutePath();
-        }
-
-        @Override
-        public String getRemotePath() {
-            return null;
-        }
-
-        @Override
-        public boolean getNeedsUpdateThumbnail() {
-            return mNeedsUpdate;
-        }
-
-        @Override
-        public void setNeedsUpdateThumbnail(boolean needsUpdate) {
-            mNeedsUpdate = needsUpdate;
-        }
-
-        @Override
-        public boolean getIsDown() {
-            return false;
-        }
-
-        @Override
-        public Object getFile() {
-            return mFile;
-        }
-    }
-
-    public static class AsyncTaskOCFile implements AsyncTaskFile{
-
-        private OCFile mFile;
-
-        public AsyncTaskOCFile(OCFile file){
-            mFile = file;
-        }
-
-        @Override
-        public String getId() {
-            return mFile.getRemoteId();
-        }
-
-        @Override
-        public String getTagId() {
-            return String.valueOf(mFile.getFileId());
-        }
-
-        @Override
-        public String getPath() {
-            return mFile.getStoragePath();
-        }
-
-        @Override
-        public String getRemotePath() {
-            return mFile.getRemotePath();
-        }
-
-        @Override
-        public boolean getNeedsUpdateThumbnail() {
-            return mFile.needsUpdateThumbnail();
-        }
-
-        @Override
-        public void setNeedsUpdateThumbnail(boolean needsUpdate) {
-            mFile.setNeedsUpdateThumbnail(needsUpdate);
-        }
-
-        @Override
-        public boolean getIsDown() {
-            return mFile.isDown();
-        }
-
-        @Override
-        public Object getFile() {
-            return mFile;
-        }
-    }
-
-    public static class ThumbnailGenerationGlobalTask extends AsyncTask<AsyncTaskFile, Void, Bitmap> {
+    public static class ThumbnailGenerationTask extends AsyncTask<Object, Void, Bitmap> {

         private final WeakReference<ImageView> mImageViewReference;
         private static Account mAccount;
         private final WeakReference<ImageView> mImageViewReference;
         private static Account mAccount;

-        private AsyncTaskFile mFile;
+        private Object mFile;

         private FileDataStorageManager mStorageManager;
 
 
         private FileDataStorageManager mStorageManager;
 
 

-        public ThumbnailGenerationGlobalTask(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)


@@ -264,99 +157,30 @@ public class ThumbnailsCacheManager {
             mAccount = account;
         }
 
             mAccount = account;
         }
 

-        public ThumbnailGenerationGlobalTask(ImageView imageView) {
+        public ThumbnailGenerationTask(ImageView imageView) {

             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<ImageView>(imageView);
         }
 
         @Override
             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<ImageView>(imageView);
         }
 
         @Override

-        protected Bitmap doInBackground(AsyncTaskFile... params) {
+        protected Bitmap doInBackground(Object... params) {

             Bitmap thumbnail = null;
 
             try {
                 if (mAccount != null) {
             Bitmap thumbnail = 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());
                 }
 
                 mFile = params[0];
                     mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                             getClientFor(ocAccount, MainApp.getAppContext());
                 }
 
                 mFile = params[0];

-
-                final String imageKey = String.valueOf(mFile.getId());
-
-                // Check disk cache in background thread
-                thumbnail = getBitmapFromDiskCache(imageKey);
-
-                // Check if mFile passed is an OCFile (for OCFile thumbs)
-                if (mFile instanceof AsyncTaskOCFile) {
-
-                    // Not found in disk cache
-                    if (thumbnail == null || mFile.getNeedsUpdateThumbnail()) {
-
-                        int px = getThumbnailDimension();
-
-                        if (mFile.getIsDown()) {
-                            Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
-                                    mFile.getPath(), px, px);
-
-                            if (bitmap != null) {
-                                thumbnail = addThumbnailToCache(imageKey, bitmap, mFile.getPath(), px);
-
-                                mFile.setNeedsUpdateThumbnail(false);
-                                mStorageManager.saveFile((OCFile) mFile.getFile());
-                            }
-
-                        } 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) {
-                                    try {
-                                        int status = -1;
-
-                                        String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +
-                                                px + "/" + px + Uri.encode(mFile.getRemotePath(), "/");
-                                        Log_OC.d("Thumbnail", "URI: " + uri);
-                                        GetMethod get = new GetMethod(uri);
-                                        status = mClient.executeMethod(get);
-                                        if (status == HttpStatus.SC_OK) {
-                                            byte[] bytes = get.getResponseBody();
-                                            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-                                            thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
-
-                                            // Add thumbnail to cache
-                                            if (thumbnail != null) {
-                                                addBitmapToCache(imageKey, thumbnail);
-                                            }
-                                        }
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                } else {
-                                    Log_OC.d(TAG, "Server too old");
-                                }
-                            }
-                        }
-                    }
-                // Check if mFile passed is a File (for local thumbs)
-                } else if (mFile instanceof AsyncTaskFileLocal) {
-
-                    // Not found in disk cache
-                    if (thumbnail == null) {
-
-                        int px = getThumbnailDimension();
-
-                        Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
-                                mFile.getPath(), px, px);
-
-                        if (bitmap != null) {
-                            thumbnail = addThumbnailToCache(imageKey, bitmap, mFile.getPath(), px);
-                        }
-                    }
-
+                
+                if (mFile instanceof OCFile) {
+                    thumbnail = doOCFileInBackground();
+                }  else if (mFile instanceof File) {
+                    thumbnail = doFileInBackground();
+                //} else {  do nothing

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


@@ -367,20 +191,21 @@ public class ThumbnailsCacheManager {
                     }
                 }
 
                     }
                 }
 

-

             return thumbnail;
         }
 
         protected void onPostExecute(Bitmap bitmap){
             return thumbnail;
         }
 
         protected void onPostExecute(Bitmap bitmap){

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

                 final ImageView imageView = mImageViewReference.get();
                 final ImageView imageView = mImageViewReference.get();

-                final ThumbnailGenerationGlobalTask bitmapWorkerTask = getBitmapGlobalWorkerTask(imageView);
-                if (this == bitmapWorkerTask && imageView != null) {
-                    if (String.valueOf(imageView.getTag()).equals(mFile.getTagId())) {
+                final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
+                if (this == bitmapWorkerTask) {
+                    String tagId = "";
+                    if (mFile instanceof OCFile){
+                        tagId = String.valueOf(((OCFile)mFile).getFileId());
+                    } else if (mFile instanceof File){
+                        tagId = String.valueOf(mFile.hashCode());
+                    }
+                    if (String.valueOf(imageView.getTag()).equals(tagId)) {

                         imageView.setImageBitmap(bitmap);
                     }
                 }
                         imageView.setImageBitmap(bitmap);
                     }
                 }


@@ -415,19 +240,128 @@ 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));
+            return Math.round(r.getDimension(R.dimen.file_icon_size_grid));
+        }
+
+        private Bitmap doOCFileInBackground() {
+            OCFile file = (OCFile)mFile;
+
+            final String imageKey = String.valueOf(file.getRemoteId());
+
+            // Check disk cache in background thread
+            Bitmap thumbnail = getBitmapFromDiskCache(imageKey);
+
+            // Not found in disk cache
+            if (thumbnail == null || file.needsUpdateThumbnail()) {
+
+                int px = getThumbnailDimension();
+
+                if (file.isDown()) {
+                    Bitmap temp = BitmapUtils.decodeSampledBitmapFromFile(
+                            file.getStoragePath(), px, px);
+                    Bitmap bitmap = ThumbnailUtils.extractThumbnail(temp, px, px);
+
+                    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);
+                        mStorageManager.saveFile(file);
+                    }
+
+                } else {
+                    // Download thumbnail from server
+                    OwnCloudVersion serverOCVersion = AccountUtils.getServerVersion(mAccount);
+                    if (mClient != null && serverOCVersion != null) {
+                        if (serverOCVersion.supportsRemoteThumbnails()) {
+                            try {
+                                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);
+                                int status = mClient.executeMethod(get);
+                                if (status == HttpStatus.SC_OK) {
+                                    InputStream inputStream = get.getResponseBodyAsStream();
+                                    Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+                                    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);
+                                    }
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        } else {
+                            Log_OC.d(TAG, "Server too old");
+                        }
+                    }
+                }
+            }
+
+            return thumbnail;
+
+        }
+
+        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() {
+            File file = (File)mFile;
+
+            final String imageKey = String.valueOf(file.hashCode());
+
+            // Check disk cache in background thread
+            Bitmap thumbnail = getBitmapFromDiskCache(imageKey);
+
+            // Not found in disk cache
+            if (thumbnail == null) {
+
+                int px = getThumbnailDimension();
+
+                Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
+                        file.getAbsolutePath(), px, px);
+
+                if (bitmap != null) {
+                    thumbnail = addThumbnailToCache(imageKey, bitmap, file.getPath(), px);
+                }
+            }
+            return thumbnail;
+        }
+

     }
 
     }
 

-    public static boolean cancelPotentialGlobalWork(AsyncTaskFile file, ImageView imageView) {
-        final ThumbnailGenerationGlobalTask bitmapWorkerTask = getBitmapGlobalWorkerTask(imageView);
+    public static boolean cancelPotentialWork(Object file, ImageView imageView) {
+        final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);

 
         if (bitmapWorkerTask != null) {
 
         if (bitmapWorkerTask != null) {

-            final AsyncTaskFile bitmapData = bitmapWorkerTask.mFile;
+            final Object bitmapData = bitmapWorkerTask.mFile;

             // If bitmapData is not yet set or it differs from the new data
             if (bitmapData == null || bitmapData != file) {
                 // Cancel previous task
                 bitmapWorkerTask.cancel(true);
             // If bitmapData is not yet set or it differs from the new data
             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;


@@ -437,30 +371,30 @@ public class ThumbnailsCacheManager {
         return true;
     }
 
         return true;
     }
 

-    public static ThumbnailGenerationGlobalTask getBitmapGlobalWorkerTask(ImageView imageView) {
+    public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {

         if (imageView != null) {
             final Drawable drawable = imageView.getDrawable();
         if (imageView != null) {
             final Drawable drawable = imageView.getDrawable();

-            if (drawable instanceof AsyncGlobalDrawable) {
-                final AsyncGlobalDrawable asyncDrawable = (AsyncGlobalDrawable) drawable;
+            if (drawable instanceof AsyncDrawable) {
+                final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;

                 return asyncDrawable.getBitmapWorkerTask();
             }
         }
         return null;
     }
 
                 return asyncDrawable.getBitmapWorkerTask();
             }
         }
         return null;
     }
 

-    public static class AsyncGlobalDrawable extends BitmapDrawable {
-        private final WeakReference<ThumbnailGenerationGlobalTask> bitmapWorkerTaskReference;
+    public static class AsyncDrawable extends BitmapDrawable {
+        private final WeakReference<ThumbnailGenerationTask> bitmapWorkerTaskReference;

 
 

-        public AsyncGlobalDrawable(
-                Resources res, Bitmap bitmap, ThumbnailGenerationGlobalTask bitmapWorkerTask
+        public AsyncDrawable(
+                Resources res, Bitmap bitmap, ThumbnailGenerationTask bitmapWorkerTask

         ) {
 
             super(res, bitmap);
             bitmapWorkerTaskReference =
         ) {
 
             super(res, bitmap);
             bitmapWorkerTaskReference =

-                    new WeakReference<ThumbnailGenerationGlobalTask>(bitmapWorkerTask);
+                    new WeakReference<ThumbnailGenerationTask>(bitmapWorkerTask);

         }
 
         }
 

-        public ThumbnailGenerationGlobalTask getBitmapWorkerTask() {
+        public ThumbnailGenerationTask getBitmapWorkerTask() {

             return bitmapWorkerTaskReference.get();
         }
     }
             return bitmapWorkerTaskReference.get();
         }
     }