Other minor changes after CR

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 3083d7e..edab29d 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -248,26 +248,27 @@ public class ThumbnailsCacheManager {
 
         private Bitmap doOCFileInBackground() {
             Bitmap thumbnail = null;
 
         private Bitmap doOCFileInBackground() {
             Bitmap thumbnail = null;

+            OCFile file = (OCFile)mFile;

 
 

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

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

-            if (thumbnail == null || ((OCFile)mFile).needsUpdateThumbnail()) {
+            if (thumbnail == null || file.needsUpdateThumbnail()) {

 
                 int px = getThumbnailDimension();
 
 
                 int px = getThumbnailDimension();
 

-                if (((OCFile)mFile).isDown()) {
+                if (file.isDown()) {

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

-                            ((OCFile)mFile).getStoragePath(), px, px);
+                            file.getStoragePath(), px, px);

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

-                        thumbnail = addThumbnailToCache(imageKey, bitmap, ((OCFile)mFile).getStoragePath(), px);
+                        thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), px);

 
 

-                        ((OCFile)mFile).setNeedsUpdateThumbnail(false);
-                        mStorageManager.saveFile(((OCFile)mFile));
+                        file.setNeedsUpdateThumbnail(false);
+                        mStorageManager.saveFile(file);

                     }
 
                 } else {
                     }
 
                 } else {


@@ -279,7 +280,7 @@ public class ThumbnailsCacheManager {
                                 int status = -1;
 
                                 String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +
                                 int status = -1;
 
                                 String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +

-                                        px + "/" + px + Uri.encode(((OCFile)mFile).getRemotePath(), "/");
+                                        px + "/" + px + Uri.encode(file.getRemotePath(), "/");

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


@@ -309,7 +310,9 @@ public class ThumbnailsCacheManager {
 
         private Bitmap doFileInBackground() {
             Bitmap thumbnail = null;
 
         private Bitmap doFileInBackground() {
             Bitmap thumbnail = null;

-            final String imageKey = String.valueOf(mFile.hashCode());
+            File file = (File)mFile;
+
+            final String imageKey = String.valueOf(file.hashCode());

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


@@ -320,10 +323,10 @@ public class ThumbnailsCacheManager {
                 int px = getThumbnailDimension();
 
                 Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
                 int px = getThumbnailDimension();
 
                 Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(

-                        ((File)mFile).getAbsolutePath(), px, px);
+                        file.getAbsolutePath(), px, px);

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

-                    thumbnail = addThumbnailToCache(imageKey, bitmap, ((File)mFile).getPath(), px);
+                    thumbnail = addThumbnailToCache(imageKey, bitmap, file.getPath(), px);

                 }
             }
             return thumbnail;
                 }
             }
             return thumbnail;

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index a5caea2..90f592f 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -223,7 +223,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                             if (thumbnail == null) {\r
                                 thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
                             }\r
                             if (thumbnail == null) {\r
                                 thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
                             }\r

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

                                     mContext.getResources(), \r
                                     thumbnail, \r
                                     task\r
                                     mContext.getResources(), \r
                                     thumbnail, \r
                                     task\r