Skip to content

minor thumbnail refactorings #1418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
David-Development merged 2 commits into from
Apr 24, 2024
Merged

minor thumbnail refactorings #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20e8485
fix missing thumbnails
David-Development Apr 24, 2024
053ddc1
minor refactorings regarding to thumbnails
David-Development Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/main/java/de/luhmer/owncloudnewsreader/adapter/RssItemHeadlineThumbnailViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class RssItemHeadlineThumbnailViewHolder internal constructor(
binding.starImageview.visibility = if (rssItem.starred_temp) View.VISIBLE else View.GONE
binding.imgViewThumbnail.colorFilter = null
val mediaThumbnail = rssItem.mediaThumbnail
if (mediaThumbnail.isNullOrEmpty()) {
if (!mediaThumbnail.isNullOrEmpty()) {
binding.imgViewThumbnail.visibility = View.VISIBLE
mGlide
.load(mediaThumbnail)
Expand Down
22 changes: 12 additions & 10 deletions News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ImageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ public class ImageHandler {
private static final Pattern patternHref = Pattern.compile("<a[^>]*>");
private static final Pattern patternHrefLink = Pattern.compile("href=\"(.*?)\"");

public static List<String> getImageLinksFromText(String articleUrl, String text)
{
public static List<String> getImageLinksFromText(String articleUrl, String text) {
List<String> links = new ArrayList<>();

Matcher matcher = patternImg.matcher(text);
Expand All @@ -50,15 +49,18 @@ public static List<String> getImageLinksFromText(String articleUrl, String text)
Matcher matcherSrcLink = patternImgSrcLink.matcher(matcher.group());
if(matcherSrcLink.find()) {
String link = matcherSrcLink.group(1);
if(link != null && link.startsWith("//")) { //Maybe the text contains image urls without http or https prefix.
link = "https:" + link;
}

// the android universal image loader doesn't support svg images. Therefore we don't want to load them through UIL
if(link.endsWith(".svg")) {
Log.d(TAG, "detected unsupported svg image in article: " + articleUrl + " -> " + link);
} else {
links.add(link);
if (link != null) {
if (link.startsWith("//")) { //Maybe the text contains image urls without http or https prefix.
link = "https:" + link;
}

// the android universal image loader doesn't support svg images. Therefore we don't want to load them through UIL
if (link.endsWith(".svg")) {
Log.d(TAG, "detected unsupported svg image in article: " + articleUrl + " -> " + link);
} else {
links.add(link);
}
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions ...rc/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/InsertRssItemIntoDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,14 @@ static RssItem parseItem(JsonObject e) {
rssItem.setBody(content);

String mediaThumbnail = getStringOrEmpty("mediaThumbnail", e); // Possible XSS Fields
// in case the server doesn't provide a mediaThumbnail - the app will try to find one
if(mediaThumbnail.isEmpty()) {
List<String> images = ImageHandler.getImageLinksFromText(url, content);
if(images.size() > 0) {
// Log.d(TAG, "extracted mediaThumbnail from body");
if (!images.isEmpty()) {
mediaThumbnail = images.get(0);
// Log.d(TAG, "extracted mediaThumbnail from body" + mediaThumbnail);
} else {
Log.d(TAG, "extracting mediaThumbnail from body failed - no images detected");
Log.d(TAG, "extraction of mediaThumbnail not possible - no images detected");
}
}
rssItem.setMediaThumbnail(mediaThumbnail);
Expand Down