Merge remote-tracking branch 'upstream/develop' into resizedImages

[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 0e59a83..49bda88 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -29,16 +29,23 @@ import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 
 import android.accounts.Account;
 import org.apache.commons.httpclient.methods.GetMethod;
 
 import android.accounts.Account;

+import android.accounts.AccountManager;
+import android.content.Context;

 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.Point;

 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.os.AsyncTask;

+import android.view.Display;
+import android.view.View;
+import android.view.WindowManager;

 import android.widget.ImageView;
 import android.widget.ImageView;

+import android.widget.ProgressBar;

 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;


@@ -140,11 +147,12 @@ public class ThumbnailsCacheManager {
 
     public static class ThumbnailGenerationTask extends AsyncTask<Object, Void, Bitmap> {
         private final WeakReference<ImageView> mImageViewReference;
 
     public static class ThumbnailGenerationTask extends AsyncTask<Object, Void, Bitmap> {
         private final WeakReference<ImageView> mImageViewReference;

+        private WeakReference<ProgressBar> mProgressWheelRef;

         private static Account mAccount;
         private Object mFile;
         private static Account mAccount;
         private Object mFile;

+        private Boolean mIsThumbnail;

         private FileDataStorageManager mStorageManager;
 
         private FileDataStorageManager mStorageManager;
 

-

         public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager,
                                        Account account) {
             // Use a WeakReference to ensure the ImageView can be garbage collected
         public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager,
                                        Account account) {
             // Use a WeakReference to ensure the ImageView can be garbage collected


@@ -155,6 +163,12 @@ public class ThumbnailsCacheManager {
             mAccount = account;
         }
 
             mAccount = account;
         }
 

+        public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager,
+                                       Account account, ProgressBar progressWheel) {
+        this(imageView, storageManager, account);
+        mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);
+        }
+

         public ThumbnailGenerationTask(ImageView imageView) {
             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<ImageView>(imageView);
         public ThumbnailGenerationTask(ImageView imageView) {
             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<ImageView>(imageView);


@@ -173,12 +187,15 @@ public class ThumbnailsCacheManager {
                 }
 
                 mFile = params[0];
                 }
 
                 mFile = params[0];

+                mIsThumbnail = (Boolean) params[1];
+

                 
                 if (mFile instanceof OCFile) {
                 
                 if (mFile instanceof OCFile) {

-                    thumbnail = doOCFileInBackground();
+                    thumbnail = doOCFileInBackground(mIsThumbnail);

                 }  else if (mFile instanceof File) {
                 }  else if (mFile instanceof File) {

-                    thumbnail = doFileInBackground();
-                //} else {  do nothing
+                    thumbnail = doFileInBackground(mIsThumbnail);
+                } else {
+                    // do nothing

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


@@ -208,7 +225,14 @@ public class ThumbnailsCacheManager {
                         tagId = String.valueOf(mFile.hashCode());
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
                         tagId = String.valueOf(mFile.hashCode());
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {

+                        if (mProgressWheelRef != null) {
+                            final ProgressBar progressWheel = mProgressWheelRef.get();
+                            if (progressWheel != null) {
+                                progressWheel.setVisibility(View.GONE);
+                            }
+                        }

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

+                        imageView.setVisibility(View.VISIBLE);

                     }
                 }
             }
                     }
                 }
             }


@@ -219,12 +243,13 @@ public class ThumbnailsCacheManager {
          * @param imageKey: thumb key
          * @param bitmap:   image for extracting thumbnail
          * @param path:     image path
          * @param imageKey: thumb key
          * @param bitmap:   image for extracting thumbnail
          * @param path:     image path

-         * @param px:       thumbnail dp
+         * @param pxW:       thumbnail width
+         * @param pxH:       thumbnail height

          * @return Bitmap
          */
          * @return Bitmap
          */

-        private Bitmap addThumbnailToCache(String imageKey, Bitmap bitmap, String path, int px){
+        private Bitmap addThumbnailToCache(String imageKey, Bitmap bitmap, String path, int pxW, int pxH){

 
 

-            Bitmap thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
+            Bitmap thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);

 
             // Rotate image, obeying exif tag
             thumbnail = BitmapUtils.rotateImage(thumbnail,path);
 
             // Rotate image, obeying exif tag
             thumbnail = BitmapUtils.rotateImage(thumbnail,path);


@@ -245,25 +270,49 @@ public class ThumbnailsCacheManager {
             return 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 Point getScreenDimension(){
+            WindowManager wm = (WindowManager) MainApp.getAppContext().getSystemService(Context.WINDOW_SERVICE);
+            Display display = wm.getDefaultDisplay();
+            Point test = new Point();
+            display.getSize(test);
+            return test;
+        }
+
+        private Bitmap doOCFileInBackground(Boolean isThumbnail) {
+            Bitmap thumbnail = null;

             OCFile file = (OCFile)mFile;
 
             OCFile file = (OCFile)mFile;
 

-            final String imageKey = String.valueOf(file.getRemoteId());
+            // distinguish between thumbnail and resized image
+            String temp = String.valueOf(file.getRemoteId());
+            if (isThumbnail){
+                temp = "t" + temp;
+            } else {
+                temp = "r" + temp;
+            }
+
+            final String imageKey = temp;

 
             // Check disk cache in background thread
 
             // Check disk cache in background thread

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

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

-
-                int px = getThumbnailDimension();
+                int pxW = 0;
+                int pxH = 0;
+                if (mIsThumbnail) {
+                    pxW = pxH = getThumbnailDimension();
+                } else {
+                    Point p = getScreenDimension();
+                    pxW = p.x;
+                    pxH = p.y;
+                }

 
                 if (file.isDown()) {
                     Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
 
                 if (file.isDown()) {
                     Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(

-                            file.getStoragePath(), px, px);
+                            file.getStoragePath(), pxW, pxH);

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

-                        thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), px);
+                        thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), pxW, pxH);

 
                         file.setNeedsUpdateThumbnail(false);
                         mStorageManager.saveFile(file);
 
                         file.setNeedsUpdateThumbnail(false);
                         mStorageManager.saveFile(file);


@@ -277,7 +326,7 @@ public class ThumbnailsCacheManager {
                             try {
                                 String uri = mClient.getBaseUri() + "" +
                                         "/index.php/apps/files/api/v1/thumbnail/" +
                             try {
                                 String uri = mClient.getBaseUri() + "" +
                                         "/index.php/apps/files/api/v1/thumbnail/" +

-                                        px + "/" + px + Uri.encode(file.getRemotePath(), "/");
+                                        pxW + "/" + pxH + Uri.encode(file.getRemotePath(), "/");

                                 Log_OC.d("Thumbnail", "URI: " + uri);
                                 GetMethod get = new GetMethod(uri);
                                 int status = mClient.executeMethod(get);
                                 Log_OC.d("Thumbnail", "URI: " + uri);
                                 GetMethod get = new GetMethod(uri);
                                 int status = mClient.executeMethod(get);


@@ -287,7 +336,26 @@ public class ThumbnailsCacheManager {
 //                                            bytes.length);
                                     InputStream inputStream = get.getResponseBodyAsStream();
                                     Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
 //                                            bytes.length);
                                     InputStream inputStream = get.getResponseBodyAsStream();
                                     Bitmap bitmap = BitmapFactory.decodeStream(inputStream);

-                                    thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
+                                    thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);
+                                    byte[] bytes = get.getResponseBody();
+
+                                    String type = "";
+                                    if (mIsThumbnail){
+                                        type = "Thumbnail";
+                                    } else {
+                                        type = "Resized image";
+                                    }
+                                    Log_OC.d("Thumbnail",
+                                            type + " size of " + file.getRemotePath()
+                                                 + ": " + bytes.length);
+
+                                    // bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+
+                                    if (mIsThumbnail) {
+                                        thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);
+                                    } else {
+                                        thumbnail = bitmap;
+                                    }

 
                                     // Add thumbnail to cache
                                     if (thumbnail != null) {
 
                                     // Add thumbnail to cache
                                     if (thumbnail != null) {


@@ -308,24 +376,32 @@ public class ThumbnailsCacheManager {
 
         }
 
 
         }
 

-        private Bitmap doFileInBackground() {
+        private Bitmap doFileInBackground(Boolean mIsThumbnail) {
+            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

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

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

-
-                int px = getThumbnailDimension();
+                int pxW = 0;
+                int pxH = 0;
+                if (mIsThumbnail) {
+                    pxW = pxH = getThumbnailDimension();
+                } else {
+                    Point p = getScreenDimension();
+                    pxW = p.x;
+                    pxH = p.y;
+                }

 
                 Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
 
                 Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(

-                        file.getAbsolutePath(), px, px);
+                        file.getAbsolutePath(), pxW, pxH);

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

-                    thumbnail = addThumbnailToCache(imageKey, bitmap, file.getPath(), px);
+                    thumbnail = addThumbnailToCache(imageKey, bitmap, file.getPath(), pxW, pxH);

                 }
             }
             return thumbnail;
                 }
             }
             return thumbnail;