From d7de54a6a51cdad174c4461f8b5e3279910d433c Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 Oct 2014 16:13:17 +0200
Subject: [PATCH] Fix glitch in reuse of thumbnails after crossed rename of
 files in the server side

---
 src/com/owncloud/android/providers/FileContentProvider.java  | 2 +-
 src/com/owncloud/android/ui/adapter/FileListListAdapter.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index 22a47aab..a94454ce 100644
--- 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));
-                ThumbnailsCacheManager.removeFileFromCache(remoteId);
+                //ThumbnailsCacheManager.removeFileFromCache(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 df23414c..0d10e7fa 100644
--- 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(
                                             fileIcon, mStorageManager
                                     );
+                            if (thumbnail == null) {
+                                thumbnail = ThumbnailsCacheManager.mDefaultImg;
+                            }
                             final AsyncDrawable asyncDrawable = new AsyncDrawable(
                                     mContext.getResources(), 
-                                    ThumbnailsCacheManager.mDefaultImg, 
+                                    thumbnail, 
                                     task
                             );
                             fileIcon.setImageDrawable(asyncDrawable);
-- 
2.11.0