Skip to content

Commit ba280d8

Browse files
Merge pull request #15904 from nextcloud/backport/15883/stable-3.34
[stable-3.34] fix: read only collection
2 parents defda96 + 202b62f commit ba280d8

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

app/src/main/java/com/owncloud/android/utils/DisplayUtils.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
import java.nio.charset.Charset;
8080
import java.text.DateFormat;
8181
import java.text.SimpleDateFormat;
82+
import java.util.ArrayList;
8283
import java.util.Date;
8384
import java.util.HashMap;
8485
import java.util.List;
@@ -828,7 +829,7 @@ public static void setThumbnail(OCFile file,
828829

829830
private static void setThumbnailFirstTimeForFile(OCFile file, ImageView thumbnailView, FileDataStorageManager storageManager, List<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks, boolean gridView, LoaderImageView shimmerThumbnail, User user, AppPreferences preferences, Context context, ViewThemeUtils viewThemeUtils) {
830831
if (file.getRemoteId() != null) {
831-
generateNewThumbnail(file, thumbnailView, user, storageManager, asyncTasks, gridView, context, shimmerThumbnail, preferences, viewThemeUtils);
832+
generateNewThumbnail(file, thumbnailView, user, storageManager, new ArrayList<>(asyncTasks), gridView, context, shimmerThumbnail, preferences, viewThemeUtils);
832833
return;
833834
}
834835

@@ -873,7 +874,7 @@ private static void setThumbnailForFolder(OCFile file, ImageView thumbnailView,
873874
private static void setThumbnailFromCache(OCFile file, ImageView thumbnailView, FileDataStorageManager storageManager, List<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks, boolean gridView, LoaderImageView shimmerThumbnail, User user, AppPreferences preferences, Context context, ViewThemeUtils viewThemeUtils) {
874875
final var thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.getRemoteId());
875876
if (thumbnail == null || file.isUpdateThumbnailNeeded()) {
876-
generateNewThumbnail(file, thumbnailView, user, storageManager, asyncTasks, gridView, context, shimmerThumbnail, preferences, viewThemeUtils);
877+
generateNewThumbnail(file, thumbnailView, user, storageManager, new ArrayList<>(asyncTasks), gridView, context, shimmerThumbnail, preferences, viewThemeUtils);
877878
setThumbnailBackgroundForPNGFileIfNeeded(file, context, thumbnailView);
878879
return;
879880
}
@@ -901,7 +902,7 @@ private static void generateNewThumbnail(OCFile file,
901902
ImageView thumbnailView,
902903
User user,
903904
FileDataStorageManager storageManager,
904-
List<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks,
905+
ArrayList<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks,
905906
boolean gridView,
906907
Context context,
907908
LoaderImageView shimmerThumbnail,
@@ -986,7 +987,7 @@ public void onError() {
986987
new ThumbnailsCacheManager.ThumbnailGenerationTaskObject(file,
987988
file.getRemoteId()));
988989
thumbnailView.invalidate();
989-
} catch (IllegalArgumentException e) {
990+
} catch (Exception e) {
990991
Log_OC.d(TAG, "ThumbnailGenerationTask : " + e.getMessage());
991992
}
992993
}

0 commit comments

Comments
 (0)