Skip to content

Commit 02baf99

Browse files
committed
check and set preview enable before fetching from server blindly
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent b3cfba9 commit 02baf99

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,14 @@ private Bitmap doThumbnailFromOCFileInBackground() {
638638
}
639639
}
640640

641+
boolean serverHasPreview = !(file instanceof OCFile) || ((OCFile) file).isPreviewAvailable();
642+
643+
if (thumbnail == null && !serverHasPreview) {
644+
Log_OC.d(TAG, "Server reports no preview for file: " + file.getFileName());
645+
}
646+
641647
// Download thumbnail from server if still null
642-
if (thumbnail == null && mClient != null) {
648+
if (thumbnail == null && mClient != null && serverHasPreview) {
643649
Log_OC.d(TAG, "Attempting to download thumbnail from server for file: " + file.getFileName());
644650
GetMethod getMethod = null;
645651

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,6 +1785,7 @@ private void updateOCFile(OCFile file, RemoteFile remoteFile) {
17851785
file.setRemoteId(remoteFile.getRemoteId());
17861786
file.setPermissions(remoteFile.getPermissions());
17871787
file.setUploadTimestamp(remoteFile.getUploadTimestamp());
1788+
file.setPreviewAvailable(remoteFile.isHasPreview());
17881789
}
17891790

17901791
public interface OnRenameListener {

0 commit comments

Comments
 (0)