Refactor ThumbnailsCacheManager to reduce repeated code

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index bf62a23..434b09a 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -139,140 +139,127 @@ public class ThumbnailsCacheManager {
         return null;
     }
 
         return null;
     }
 

-    
-    public static boolean cancelPotentialWork(OCFile file, ImageView imageView) {
-        final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
+    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();

 
 

-        if (bitmapWorkerTask != null) {
-            final OCFile 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);
-            } else {
-                // The same work is already in progress
-                return false;
-            }
-        }
-        // No task associated with the ImageView, or an existing task was cancelled
-        return true;

     }
     }

-    
-    public static boolean cancelPotentialWork(File file, ImageView imageView) {
-        final ThumbnailLocalGenerationTask bitmapWorkerTask = getBitmapLocalWorkerTask(imageView);

 
 

-        if (bitmapWorkerTask != null) {
-            final File 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);
-            } else {
-                // The same work is already in progress
-                return false;
-            }
+    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;

         }
         }

-        // No task associated with the ImageView, or an existing task was cancelled
-        return true;

     }
     }

-    
-    public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {
-        if (imageView != null) {
-            final Drawable drawable = imageView.getDrawable();
-            if (drawable instanceof AsyncDrawable) {
-                final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-                return asyncDrawable.getBitmapWorkerTask();
-            }
-         }
-         return null;
-     }
-    
-    public static ThumbnailLocalGenerationTask getBitmapLocalWorkerTask(ImageView imageView) {
-        if (imageView != null) {
-            final Drawable drawable = imageView.getDrawable();
-            if (drawable instanceof AsyncLocalDrawable) {
-                final AsyncLocalDrawable asyncDrawable = (AsyncLocalDrawable) drawable;
-                return asyncDrawable.getBitmapWorkerTask();
-            }
-         }
-         return null;
-     }
-    
-    public static class ThumbnailLocalGenerationTask extends AsyncTask<File, Void, Bitmap> {
-        private final WeakReference<ImageView> mImageViewLocalReference;
-        private File mFile;
-        
-        public ThumbnailLocalGenerationTask(ImageView imageView) {
-         // Use a WeakReference to ensure the ImageView can be garbage collected
-            mImageViewLocalReference = new WeakReference<ImageView>(imageView);
+
+    public static class AsyncTaskOCFile implements AsyncTaskFile{
+
+        private OCFile mFile;
+
+        public AsyncTaskOCFile(OCFile file){
+            mFile = file;

         }
 
         }
 

-        // Decode image in background.

         @Override
         @Override

-        protected Bitmap doInBackground(File... params) {
-            Bitmap thumbnail = null;
-            
-            try {
-                mFile = params[0];
-                final String imageKey = String.valueOf(mFile.hashCode());
-    
-                // Check disk cache in background thread
-                thumbnail = getBitmapFromDiskCache(imageKey);
-    
-                // Not found in disk cache
-                if (thumbnail == null) { 
-                    // Converts dp to pixel
-                    Resources r = MainApp.getAppContext().getResources();
-                    
-                    int px = (int) Math.round(r.getDimension(R.dimen.file_icon_size));
-                    
-                    Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
-                            mFile.getAbsolutePath(), px, px);
-                    
-                    if (bitmap != null) {
-                        thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
-
-                        // Add thumbnail to cache
-                        addBitmapToCache(imageKey, thumbnail);
-                    }
-                }
-                
-            } catch (Throwable t) {
-                // the app should never break due to a problem with thumbnails
-                Log_OC.e(TAG, "Generation of thumbnail for " + mFile + " failed", t);
-                if (t instanceof OutOfMemoryError) {
-                    System.gc();
-                }
-            }
-            
-            return thumbnail;
+        public String getId() {
+            return mFile.getRemoteId();

         }
         }

-        
-        protected void onPostExecute(Bitmap bitmap){
-            if (isCancelled()) {
-                bitmap = null;
-            }

 
 

-            if (mImageViewLocalReference != null && bitmap != null) {
-                final ImageView imageView = mImageViewLocalReference.get();
-                final ThumbnailLocalGenerationTask bitmapWorkerTask = getBitmapLocalWorkerTask(imageView);
-                if (this == bitmapWorkerTask && imageView != null) {
-                    if (imageView.getTag().equals(mFile.hashCode())) {
-                        imageView.setImageBitmap(bitmap);
-                    }
-                }
-            }
+        @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 ThumbnailGenerationTask extends AsyncTask<OCFile, Void, Bitmap> {
+    public static class ThumbnailGenerationGlobalTask extends AsyncTask<AsyncTaskFile, Void, Bitmap> {

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

-        private OCFile mFile;
+        private AsyncTaskFile mFile;

         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 ThumbnailGenerationGlobalTask(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)
                 throw new IllegalArgumentException("storageManager must not be NULL");
             mImageViewReference = new WeakReference<ImageView>(imageView);
             if (storageManager == null)
                 throw new IllegalArgumentException("storageManager must not be NULL");


@@ -280,95 +267,115 @@ public class ThumbnailsCacheManager {
             mAccount = account;
         }
 
             mAccount = account;
         }
 

-        // Decode image in background.
+        public ThumbnailGenerationGlobalTask(ImageView imageView) {
+            // Use a WeakReference to ensure the ImageView can be garbage collected
+            mImageViewReference = new WeakReference<ImageView>(imageView);
+        }
+

         @Override
         @Override

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

             Bitmap thumbnail = null;
             Bitmap thumbnail = null;

-            
+

             try {
                 if (mAccount != null) {
                     AccountManager accountMgr = AccountManager.get(MainApp.getAppContext());
             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());
                     mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                             getClientFor(ocAccount, MainApp.getAppContext());
                 }
                     mServerVersion = accountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION);
                     OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, MainApp.getAppContext());
                     mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
                             getClientFor(ocAccount, MainApp.getAppContext());
                 }

-                
+

                 mFile = params[0];
                 mFile = params[0];

-                final String imageKey = String.valueOf(mFile.getRemoteId());
-    
+
+                final String imageKey = String.valueOf(mFile.getId());
+

                 // Check disk cache in background thread
                 thumbnail = getBitmapFromDiskCache(imageKey);
                 // Check disk cache in background thread
                 thumbnail = getBitmapFromDiskCache(imageKey);

-    
-                // Not found in disk cache
-                if (thumbnail == null || mFile.needsUpdateThumbnail()) { 
-                    // Converts dp to pixel
-                    Resources r = MainApp.getAppContext().getResources();
-                    
-                    int px = (int) Math.round(r.getDimension(R.dimen.file_icon_size));
-                    
-                    if (mFile.isDown()){
-                        Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
-                                mFile.getStoragePath(), px, px);
-                        
-                        if (bitmap != null) {
-                            thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
-                            
-                            // Rotate image, obeying exif tag
-                            thumbnail = BitmapUtils.rotateImage(thumbnail, mFile.getStoragePath());
-    
-                            // Add thumbnail to cache
-                            addBitmapToCache(imageKey, thumbnail);

 
 

-                            mFile.setNeedsUpdateThumbnail(false);
-                            mStorageManager.saveFile(mFile);
-                        }
-    
-                    } 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);
+                if (mFile instanceof AsyncTaskOCFile) {
+
+                    // Not found in disk cache
+                    if (thumbnail == null || mFile.getNeedsUpdateThumbnail()) {
+                        // Converts dp to pixel
+                        Resources r = MainApp.getAppContext().getResources();
+
+                        int px = (int) Math.round(r.getDimension(R.dimen.file_icon_size));
+
+                        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();

                                     }
                                     }

-                                } catch (Exception e) {
-                                    e.printStackTrace();
+                                } else {
+                                    Log_OC.d(TAG, "Server too old");

                                 }
                                 }

-                            } else {
-                                Log_OC.d(TAG, "Server too old");

                             }
                         }
                     }
                             }
                         }
                     }

+                } else if (mFile instanceof AsyncTaskFileLocal) {
+
+                    // Not found in disk cache
+                    if (thumbnail == null) {
+                        // Converts dp to pixel
+                        Resources r = MainApp.getAppContext().getResources();
+
+                        int px = (int) Math.round(r.getDimension(R.dimen.file_icon_size));
+
+                        Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
+                                mFile.getPath(), px, px);
+
+                        if (bitmap != null) {
+                            thumbnail = addThumbnailToCache(imageKey, bitmap, mFile.getPath(), px);
+                        }
+                    }
+

                 }
                 }

-                
-            } catch (Throwable t) {
-                // the app should never break due to a problem with thumbnails
-                Log_OC.e(TAG, "Generation of thumbnail for " + mFile + " failed", t);
-                if (t instanceof OutOfMemoryError) {
-                    System.gc();
+
+                }catch(Throwable t){
+                    // the app should never break due to a problem with thumbnails
+                    Log_OC.e(TAG, "Generation of thumbnail for " + mFile + " failed", t);
+                    if (t instanceof OutOfMemoryError) {
+                        System.gc();
+                    }

                 }
                 }

-            }
-            
+
+

             return thumbnail;
         }
             return thumbnail;
         }

-        
+

         protected void onPostExecute(Bitmap bitmap){
             if (isCancelled()) {
                 bitmap = null;
         protected void onPostExecute(Bitmap bitmap){
             if (isCancelled()) {
                 bitmap = null;


@@ -376,61 +383,73 @@ public class ThumbnailsCacheManager {
 
             if (mImageViewReference != null && bitmap != null) {
                 final ImageView imageView = mImageViewReference.get();
 
             if (mImageViewReference != null && bitmap != null) {
                 final ImageView imageView = mImageViewReference.get();

-                final ThumbnailGenerationTask bitmapWorkerTask =
-                        getBitmapWorkerTask(imageView);
+                final ThumbnailGenerationGlobalTask bitmapWorkerTask = getBitmapGlobalWorkerTask(imageView);

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

-                    if (imageView.getTag().equals(mFile.getFileId())) {
+                    if (String.valueOf(imageView.getTag()).equals(mFile.getTagId())) {

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

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

 
 

-        public AsyncDrawable(
-                Resources res, Bitmap bitmap, ThumbnailGenerationTask bitmapWorkerTask
-            ) {
-            
-            super(res, bitmap);
-            bitmapWorkerTaskReference =
-                new WeakReference<ThumbnailGenerationTask>(bitmapWorkerTask);
-        }
+        private Bitmap addThumbnailToCache(String imageKey, Bitmap bitmap, String path, int px){
+
+            Bitmap thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
+
+            // Rotate image, obeying exif tag
+            thumbnail = BitmapUtils.rotateImage(thumbnail,path);
+
+            // Add thumbnail to cache
+            addBitmapToCache(imageKey, thumbnail);
+
+            return thumbnail;

 
 

-        public ThumbnailGenerationTask getBitmapWorkerTask() {
-            return bitmapWorkerTaskReference.get();

         }
     }
         }
     }

-    
-    public static class AsyncLocalDrawable extends BitmapDrawable {
-        private final WeakReference<ThumbnailLocalGenerationTask> bitmapWorkerLocalTaskReference;

 
 

-        public AsyncLocalDrawable(Resources res, Bitmap bitmap, ThumbnailLocalGenerationTask bitmapWorkerTask) {
-            super(res, bitmap);
-            bitmapWorkerLocalTaskReference =
-                new WeakReference<ThumbnailLocalGenerationTask>(bitmapWorkerTask);
-        }
+    public static boolean cancelPotentialGlobalWork(AsyncTaskFile file, ImageView imageView) {
+        final ThumbnailGenerationGlobalTask bitmapWorkerTask = getBitmapGlobalWorkerTask(imageView);

 
 

-        public ThumbnailLocalGenerationTask getBitmapWorkerTask() {
-            return bitmapWorkerLocalTaskReference.get();
+        if (bitmapWorkerTask != null) {
+            final AsyncTaskFile 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);
+            } else {
+                // The same work is already in progress
+                return false;
+            }

         }
         }

+        // No task associated with the ImageView, or an existing task was cancelled
+        return true;

     }
 
     }
 

-    
-    /**
-     * Remove from cache the remoteId passed
-     * @param fileRemoteId: remote id of mFile passed
-     */
-    public static void removeFileFromCache(String fileRemoteId){
-        synchronized (mThumbnailsDiskCacheLock) {
-            if (mThumbnailCache != null) {
-                mThumbnailCache.removeKey(fileRemoteId);
+    public static ThumbnailGenerationGlobalTask getBitmapGlobalWorkerTask(ImageView imageView) {
+        if (imageView != null) {
+            final Drawable drawable = imageView.getDrawable();
+            if (drawable instanceof AsyncGlobalDrawable) {
+                final AsyncGlobalDrawable asyncDrawable = (AsyncGlobalDrawable) drawable;
+                return asyncDrawable.getBitmapWorkerTask();

             }
             }

-            mThumbnailsDiskCacheLock.notifyAll(); // Wake any waiting threads
+        }
+        return null;
+    }
+
+    public static class AsyncGlobalDrawable extends BitmapDrawable {
+        private final WeakReference<ThumbnailGenerationGlobalTask> bitmapWorkerTaskReference;
+
+        public AsyncGlobalDrawable(
+                Resources res, Bitmap bitmap, ThumbnailGenerationGlobalTask bitmapWorkerTask
+        ) {
+
+            super(res, bitmap);
+            bitmapWorkerTaskReference =
+                    new WeakReference<ThumbnailGenerationGlobalTask>(bitmapWorkerTask);
+        }
+
+        public ThumbnailGenerationGlobalTask getBitmapWorkerTask() {
+            return bitmapWorkerTaskReference.get();

         }
     }
         }
     }

-    

 }
 }

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index d7c077a..57efb4e 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -17,7 +17,7 @@
  */\r
 package com.owncloud.android.ui.adapter;\r
 \r
  */\r
 package com.owncloud.android.ui.adapter;\r
 \r

-
+\r

 import java.io.File;\r
 import java.util.Collections;\r
 import java.util.Comparator;\r
 import java.io.File;\r
 import java.util.Collections;\r
 import java.util.Comparator;\r


@@ -44,13 +44,12 @@ import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;\r

-import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;\r

 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 import com.owncloud.android.utils.FileStorageUtils;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 import com.owncloud.android.utils.FileStorageUtils;\r

-
+\r

 \r
 /**\r
  * This Adapter populates a ListView with all files and folders in an ownCloud\r
 \r
 /**\r
  * This Adapter populates a ListView with all files and folders in an ownCloud\r


@@ -60,7 +59,7 @@ import com.owncloud.android.utils.FileStorageUtils;
  * @author Tobias Kaminsky\r
  * @author David A. Velasco\r
  */\r
  * @author Tobias Kaminsky\r
  * @author David A. Velasco\r
  */\r

-public class FileListListAdapter extends BaseAdapter implements ListAdapter {
+public class FileListListAdapter extends BaseAdapter implements ListAdapter {\r

     private final static String PERMISSION_SHARED_WITH_ME = "S";\r
     \r
     private Context mContext;\r
     private final static String PERMISSION_SHARED_WITH_ME = "S";\r
     \r
     private Context mContext;\r


@@ -68,8 +67,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private Vector<OCFile> mFiles = null;\r
     private boolean mJustFolders;\r
 \r
     private Vector<OCFile> mFiles = null;\r
     private boolean mJustFolders;\r
 \r

-    private FileDataStorageManager mStorageManager;
-    private Account mAccount;
+    private FileDataStorageManager mStorageManager;\r
+    private Account mAccount;\r

     private ComponentsGetter mTransferServiceGetter;\r
     private Integer mSortOrder;\r
     public static final Integer SORT_NAME = 0;\r
     private ComponentsGetter mTransferServiceGetter;\r
     private Integer mSortOrder;\r
     public static final Integer SORT_NAME = 0;\r


@@ -87,8 +86,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         mJustFolders = justFolders;\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         mJustFolders = justFolders;\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r

-
-        mTransferServiceGetter = transferServiceGetter;
+\r
+        mTransferServiceGetter = transferServiceGetter;\r

         \r
         mAppPreferences = PreferenceManager\r
                 .getDefaultSharedPreferences(mContext);\r
         \r
         mAppPreferences = PreferenceManager\r
                 .getDefaultSharedPreferences(mContext);\r


@@ -96,13 +95,13 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         // Read sorting order, default to sort by name ascending\r
         mSortOrder = mAppPreferences\r
                 .getInt("sortOrder", 0);\r
         // Read sorting order, default to sort by name ascending\r
         mSortOrder = mAppPreferences\r
                 .getInt("sortOrder", 0);\r

-        mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
+        mSortAscending = mAppPreferences.getBoolean("sortAscending", true);\r

         \r
         // initialise thumbnails cache on background thread\r
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();\r
 \r
     }\r
         \r
         // initialise thumbnails cache on background thread\r
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();\r
 \r
     }\r

-    
+    \r

     @Override\r
     public boolean areAllItemsEnabled() {\r
         return true;\r
     @Override\r
     public boolean areAllItemsEnabled() {\r
         return true;\r


@@ -214,28 +213,30 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     if (thumbnail != null && !file.needsUpdateThumbnail()){\r
                         fileIcon.setImageBitmap(thumbnail);\r
                     } else {\r
                     if (thumbnail != null && !file.needsUpdateThumbnail()){\r
                         fileIcon.setImageBitmap(thumbnail);\r
                     } else {\r

+\r
+                        ThumbnailsCacheManager.AsyncTaskFile asyncTaskFile = new ThumbnailsCacheManager.AsyncTaskOCFile(file);\r

                         // generate new Thumbnail\r
                         // generate new Thumbnail\r

-                        if (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon)) {\r
-                            final ThumbnailsCacheManager.ThumbnailGenerationTask task = \r
-                                    new ThumbnailsCacheManager.ThumbnailGenerationTask(\r
+                        if (ThumbnailsCacheManager.cancelPotentialGlobalWork(asyncTaskFile, fileIcon)) {\r
+                            final ThumbnailsCacheManager.ThumbnailGenerationGlobalTask task =\r
+                                    new ThumbnailsCacheManager.ThumbnailGenerationGlobalTask(\r

                                             fileIcon, mStorageManager, mAccount\r
                                     );\r
                             if (thumbnail == null) {\r
                                 thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
                             }\r
                                             fileIcon, mStorageManager, mAccount\r
                                     );\r
                             if (thumbnail == null) {\r
                                 thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
                             }\r

-                            final AsyncDrawable asyncDrawable = new AsyncDrawable(\r
+                            final ThumbnailsCacheManager.AsyncGlobalDrawable asyncDrawable = new ThumbnailsCacheManager.AsyncGlobalDrawable(\r

                                     mContext.getResources(), \r
                                     thumbnail, \r
                                     task\r
                             );\r
                             fileIcon.setImageDrawable(asyncDrawable);\r
                                     mContext.getResources(), \r
                                     thumbnail, \r
                                     task\r
                             );\r
                             fileIcon.setImageDrawable(asyncDrawable);\r

-                            task.execute(file);\r
+                            task.execute(asyncTaskFile);\r

                         }\r
                     }\r
                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
                 }\r
                         }\r
                     }\r
                 } else {\r
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
                 }\r

-
+\r

                 if (checkIfFileIsSharedWithMe(file)) {\r
                     sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                 }\r
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                 }\r


@@ -248,7 +249,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 //                } else {\r
                     fileSizeV.setVisibility(View.INVISIBLE);\r
 //                }\r
 //                } else {\r
                     fileSizeV.setVisibility(View.INVISIBLE);\r
 //                }\r

-
+\r

                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(showRelativeTimestamp(file));\r
                 checkBoxV.setVisibility(View.GONE);\r
                 lastModV.setVisibility(View.VISIBLE);\r
                 lastModV.setText(showRelativeTimestamp(file));\r
                 checkBoxV.setVisibility(View.GONE);\r


@@ -279,7 +280,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
         return view;\r
     }\r
 \r
         return view;\r
     }\r

-
+\r

     /**\r
      * Local Folder size in human readable format\r
      * \r
     /**\r
      * Local Folder size in human readable format\r
      * \r


@@ -318,8 +319,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             return result;\r
         }\r
         return 0;\r
             return result;\r
         }\r
         return 0;\r

-    } 
-
+    } \r
+\r

     @Override\r
     public int getViewTypeCount() {\r
         return 1;\r
     @Override\r
     public int getViewTypeCount() {\r
         return 1;\r


@@ -517,5 +518,5 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private CharSequence showRelativeTimestamp(OCFile file){\r
         return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
                 DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r
     private CharSequence showRelativeTimestamp(OCFile file){\r
         return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),\r
                 DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);\r

-    }
+    }\r

 }\r
 }\r

diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index f4cf73a..73f81cf 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -36,7 +36,6 @@ import android.widget.TextView;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;

-import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncLocalDrawable;

 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;
 
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;
 


@@ -142,20 +141,21 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
                     if (thumbnail != null){
                         fileIcon.setImageBitmap(thumbnail);
                     } else {
                     if (thumbnail != null){
                         fileIcon.setImageBitmap(thumbnail);
                     } else {

+                        ThumbnailsCacheManager.AsyncTaskFile asyncTaskFile = new ThumbnailsCacheManager.AsyncTaskFileLocal(file);

                         // generate new Thumbnail
                         // generate new Thumbnail

-                        if (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon)) {
-                            final ThumbnailsCacheManager.ThumbnailLocalGenerationTask task = 
-                                    new ThumbnailsCacheManager.ThumbnailLocalGenerationTask(fileIcon);
+                        if (ThumbnailsCacheManager.cancelPotentialGlobalWork(asyncTaskFile, fileIcon)) {
+                            final ThumbnailsCacheManager.ThumbnailGenerationGlobalTask task =
+                                    new ThumbnailsCacheManager.ThumbnailGenerationGlobalTask(fileIcon);

                             if (thumbnail == null) {
                                 thumbnail = ThumbnailsCacheManager.mDefaultImg;
                             }
                             if (thumbnail == null) {
                                 thumbnail = ThumbnailsCacheManager.mDefaultImg;
                             }

-                            final AsyncLocalDrawable asyncDrawable = new AsyncLocalDrawable(
+                            final  ThumbnailsCacheManager.AsyncGlobalDrawable  asyncDrawable = new  ThumbnailsCacheManager.AsyncGlobalDrawable (

                                     mContext.getResources(), 
                                     thumbnail, 
                                     task
                             );
                             fileIcon.setImageDrawable(asyncDrawable);
                                     mContext.getResources(), 
                                     thumbnail, 
                                     task
                             );
                             fileIcon.setImageDrawable(asyncDrawable);

-                            task.execute(file);
+                            task.execute(asyncTaskFile);

                         }
                     }
                 } else {
                         }
                     }
                 } else {