Skip to content

Commit 0259f7b

Browse files
committed
Allow only thumbnails from images temporary
1 parent bc9fd4e commit 0259f7b

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
- Native Android ShareSheet
33
- Option to log HTTP requests and responses
44
- Move sort menu from toolbar to files view
5-
- Improvements in thumbnails
65
- Update background images
76
- Search when sharing with ownCloud
87
- Bug fixes, including:

owncloudApp/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ private void mergeRemoteFolder(ArrayList<RemoteFile> remoteFolderAndFiles)
353353
updatedLocalFile.setFileName(remoteFile.getFileName());
354354
// remote eTag will not be set unless file CONTENTS are synchronized
355355
updatedLocalFile.setEtag(localFile.getEtag());
356-
if (!updatedLocalFile.isFolder() &&
356+
if (!updatedLocalFile.isFolder() && updatedLocalFile.isImage() &&
357357
remoteFile.getModificationTimestamp() != localFile.getModificationTimestamp()) {
358358
updatedLocalFile.setNeedsUpdateThumbnail(true);
359359
}

owncloudApp/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
284284
} else {
285285
// Set file icon depending on its mimetype. Ask for thumbnail later.
286286
fileIcon.setImageResource(MimetypeIconUtil.getFileTypeIconId(file.getMimetype(), file.getFileName()));
287-
if (file.getRemoteId() != null) {
287+
if (file.getRemoteId() != null && file.isImage()) {
288288
// Thumbnail in Cache?
289289
Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(file.getRemoteId());
290290
if (thumbnail != null && !file.needsUpdateThumbnail()) {

0 commit comments

Comments
 (0)