|
79 | 79 | import java.nio.charset.Charset; |
80 | 80 | import java.text.DateFormat; |
81 | 81 | import java.text.SimpleDateFormat; |
| 82 | +import java.util.ArrayList; |
82 | 83 | import java.util.Date; |
83 | 84 | import java.util.HashMap; |
84 | 85 | import java.util.List; |
@@ -828,7 +829,7 @@ public static void setThumbnail(OCFile file, |
828 | 829 |
|
829 | 830 | 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) { |
830 | 831 | 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); |
832 | 833 | return; |
833 | 834 | } |
834 | 835 |
|
@@ -873,7 +874,7 @@ private static void setThumbnailForFolder(OCFile file, ImageView thumbnailView, |
873 | 874 | 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) { |
874 | 875 | final var thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.getRemoteId()); |
875 | 876 | 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); |
877 | 878 | setThumbnailBackgroundForPNGFileIfNeeded(file, context, thumbnailView); |
878 | 879 | return; |
879 | 880 | } |
@@ -901,7 +902,7 @@ private static void generateNewThumbnail(OCFile file, |
901 | 902 | ImageView thumbnailView, |
902 | 903 | User user, |
903 | 904 | FileDataStorageManager storageManager, |
904 | | - List<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks, |
| 905 | + ArrayList<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks, |
905 | 906 | boolean gridView, |
906 | 907 | Context context, |
907 | 908 | LoaderImageView shimmerThumbnail, |
@@ -986,7 +987,7 @@ public void onError() { |
986 | 987 | new ThumbnailsCacheManager.ThumbnailGenerationTaskObject(file, |
987 | 988 | file.getRemoteId())); |
988 | 989 | thumbnailView.invalidate(); |
989 | | - } catch (IllegalArgumentException e) { |
| 990 | + } catch (Exception e) { |
990 | 991 | Log_OC.d(TAG, "ThumbnailGenerationTask : " + e.getMessage()); |
991 | 992 | } |
992 | 993 | } |
|
0 commit comments