From f345e3fed2eaa339ff92522c82f39182d9b808d2 Mon Sep 17 00:00:00 2001 From: jabarros Date: Fri, 31 Oct 2014 13:52:26 +0100 Subject: [PATCH] Fix. Update the way of setting the needed of update a thumbnail when the image changes on the server --- .../android/operations/SynchronizeFolderOperation.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index ff30bd0a..d61e6784 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -324,8 +324,6 @@ public class SynchronizeFolderOperation extends RemoteOperation { * @return 'True' when any change was made in the local data, 'false' otherwise */ private void synchronizeData(ArrayList folderAndFiles, OwnCloudClient client) { - Vector mImageFiles = mStorageManager.getFolderImages(mLocalFolder); - // get 'fresh data' from the database mLocalFolder = mStorageManager.getFileByPath(mLocalFolder.getRemotePath()); @@ -375,15 +373,10 @@ public class SynchronizeFolderOperation extends RemoteOperation { if (remoteFile.isFolder()) { remoteFile.setFileLength(localFile.getFileLength()); // TODO move operations about size of folders to FileContentProvider - } else if (mRemoteFolderChanged && remoteFile.isImage()) { - // If image has been updated on the server, set for updating the thumbnail - for (OCFile fileImage: mImageFiles) { - if (remoteFile.getRemoteId().equals(fileImage.getRemoteId()) && - remoteFile.getModificationTimestamp() > fileImage.getModificationTimestamp()) { - remoteFile.setNeedsUpdateThumbnail(true); - Log.d(TAG, "Image " + remoteFile.getFileName() + " updated on the server"); - } - } + } else if (mRemoteFolderChanged && remoteFile.isImage() && + remoteFile.getModificationTimestamp() != localFile.getModificationTimestamp()) { + remoteFile.setNeedsUpdateThumbnail(true); + Log.d(TAG, "Image " + remoteFile.getFileName() + " updated on the server"); } remoteFile.setPublicLink(localFile.getPublicLink()); remoteFile.setShareByLink(localFile.isShareByLink()); -- 2.11.0