fixed storing thumbnails by correct imageKey

diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 49bda88..9b31f3a 100644 (file)
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -339,18 +339,6 @@ public class ThumbnailsCacheManager {
                                     thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);
                                     byte[] bytes = get.getResponseBody();
 
                                     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 {
                                     if (mIsThumbnail) {
                                         thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);
                                     } else {


@@ -377,13 +365,20 @@ public class ThumbnailsCacheManager {
         }
 
         private Bitmap doFileInBackground(Boolean mIsThumbnail) {
         }
 
         private Bitmap doFileInBackground(Boolean mIsThumbnail) {

-            Bitmap thumbnail = null;

             File file = (File)mFile;
 
             File file = (File)mFile;
 

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

 
             // Check disk cache in background thread
 
             // 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) {

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index eb59538..897f980 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -297,8 +297,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 if (file.isImage() && file.getRemoteId() != null){\r
                     // Thumbnail in Cache?\r
                     Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(\r
                 if (file.isImage() && file.getRemoteId() != null){\r
                     // Thumbnail in Cache?\r
                     Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(\r

-                            String.valueOf(file.getRemoteId())\r
-                            );\r
+                            "t" + String.valueOf(file.getRemoteId()));\r

                     if (thumbnail != null && !file.needsUpdateThumbnail()){\r
                         fileIcon.setImageBitmap(thumbnail);\r
                     } else {\r
                     if (thumbnail != null && !file.needsUpdateThumbnail()){\r
                         fileIcon.setImageBitmap(thumbnail);\r
                     } else {\r