Fix loading images from db even if disabled

TeamNewPipe · Aug 13, 2023 · 69ee195 · 69ee195
1 parent e68b511
commit 69ee195
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/src/main/java/org/schabi/newpipe/util/image/PicassoHelper.java b/app/src/main/java/org/schabi/newpipe/util/image/PicassoHelper.java
@@ -202,7 +202,10 @@ private static RequestCreator loadImageDefault(@Nullable final String url,
     private static RequestCreator loadImageDefault(@Nullable final String url,
                                                    final int placeholderResId,
                                                    final boolean showPlaceholderWhileLoading) {
-        if (isNullOrEmpty(url)) {
+        // if the URL was chosen with `choosePreferredImage` it will be null, but check again
+        // `shouldLoadImages` in case the URL was chosen with `imageListToDbUrl` (which is the case
+        // for URLs stored in the database)
+        if (isNullOrEmpty(url) || !ImageStrategy.shouldLoadImages()) {
             return picassoInstance
                     .load((String) null)
                     .placeholder(placeholderResId) // show placeholder when no image should load