From e4185d80d28ceed9d0f39cf9484349d0d9afa83c Mon Sep 17 00:00:00 2001 From: David-Development Date: Fri, 29 Jul 2022 18:47:43 +0200 Subject: fix bug where svg favicons are not shown inside detail view Signed-off-by: David Luhmer --- .../owncloudnewsreader/async_tasks/RssItemToHtmlTask.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java index 0bd768db..77780a85 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java @@ -1,5 +1,8 @@ package de.luhmer.owncloudnewsreader.async_tasks; +import static de.luhmer.owncloudnewsreader.NewsDetailActivity.INCOGNITO_MODE_ENABLED; +import static de.luhmer.owncloudnewsreader.helper.ThemeChooser.THEME; + import android.content.Context; import android.content.SharedPreferences; import android.os.AsyncTask; @@ -24,9 +27,6 @@ import de.luhmer.owncloudnewsreader.database.model.RssItem; import de.luhmer.owncloudnewsreader.helper.ImageHandler; import de.luhmer.owncloudnewsreader.helper.ThemeChooser; -import static de.luhmer.owncloudnewsreader.NewsDetailActivity.INCOGNITO_MODE_ENABLED; -import static de.luhmer.owncloudnewsreader.helper.ThemeChooser.THEME; - public class RssItemToHtmlTask extends AsyncTask { @@ -211,7 +211,9 @@ public class RssItemToHtmlTask extends AsyncTask { private static String getCachedFavIcon(String favIconUrl) { DiskCache diskCache = ImageLoader.getInstance().getDiskCache(); File file = diskCache.get(favIconUrl); - if(file != null) { + // note that the universalimageloader does NOT support svg icons. + // Therefore we don't want to use any cached items (the webview can render svg's just fine) + if (file != null && !favIconUrl.endsWith(".svg")) { return "file://" + file.getAbsolutePath(); } else { return favIconUrl; // Return favicon url if not cached -- cgit v1.2.3