Fix glitch in reuse of thumbnails after crossed rename of files in the server side

diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index 22a47aa..a94454c 100644 (file)
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -168,7 +168,7 @@ public class FileContentProvider extends ContentProvider {
             String remoteId = "";
             if (c != null && c.moveToFirst()) {
                 remoteId = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID));
             String remoteId = "";
             if (c != null && c.moveToFirst()) {
                 remoteId = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID));

-                ThumbnailsCacheManager.removeFileFromCache(remoteId);
+                //ThumbnailsCacheManager.removeFileFromCache(remoteId);

             }
             Log_OC.d(TAG, "Removing FILE " + remoteId);
 
             }
             Log_OC.d(TAG, "Removing FILE " + remoteId);
 

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index df23414..0d10e7f 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -197,9 +197,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                                     new ThumbnailsCacheManager.ThumbnailGenerationTask(\r
                                             fileIcon, mStorageManager\r
                                     );\r
                                     new ThumbnailsCacheManager.ThumbnailGenerationTask(\r
                                             fileIcon, mStorageManager\r
                                     );\r

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

                             final AsyncDrawable asyncDrawable = new AsyncDrawable(\r
                                     mContext.getResources(), \r
                             final AsyncDrawable asyncDrawable = new AsyncDrawable(\r
                                     mContext.getResources(), \r

-                                    ThumbnailsCacheManager.mDefaultImg, \r
+                                    thumbnail, \r

                                     task\r
                             );\r
                             fileIcon.setImageDrawable(asyncDrawable);\r
                                     task\r
                             );\r
                             fileIcon.setImageDrawable(asyncDrawable);\r