fix #792

martinrotter · Sep 7, 2022 · 4af15a8 · 4af15a8
1 parent a23a1a8
commit 4af15a8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
@@ -24,7 +24,7 @@
   <url type="donation">https://github.com/sponsors/martinrotter</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.2.4" date="2022-09-06"/>
+    <release version="4.2.4" date="2022-09-07"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>

diff --git a/resources/docs/Documentation.md b/resources/docs/Documentation.md
@@ -46,7 +46,7 @@ I highly recommend to download RSS Guard only from reputable sources.
 ## Supported Operating Systems <a id="sos"></a>
 RSS Guard is a cross-platform application, and at this point it is known to work on:
 * Windows 7+
-* GNU/Linux (including PinePhone and other Linux-based phone operating systems)
+* GNU/Linux with glibc 2.31+ (including PinePhone and other Linux-based phone operating systems)
 * BSD (FreeBSD, OpenBSD, NetBSD, etc.)
 * macOS 10.13+
 * OS/2 (ArcaOS, eComStation)

diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp
@@ -139,7 +139,7 @@ QPair<QString, QUrl> SkinFactory::generateHtmlOfArticles(const QList<Message>& m
   for (const Message& message : messages) {
     QString enclosures;
     QString enclosure_images;
-    bool is_plain = !Qt::mightBeRichText(message.m_contents.simplified());
+    bool is_plain = !TextFactory::couldBeHtml(message.m_contents);
 
     for (const Enclosure& enclosure : message.m_enclosures) {
       QString enc_url = QUrl::fromPercentEncoding(enclosure.m_url.toUtf8());

diff --git a/src/librssguard/miscellaneous/textfactory.cpp b/src/librssguard/miscellaneous/textfactory.cpp
@@ -63,6 +63,12 @@ int TextFactory::stringWidth(const QString& string, const QFontMetrics& metrics)
   return width;
 }
 
+bool TextFactory::couldBeHtml(const QString& string) {
+  const QString sstring = string.simplified();
+
+  return sstring.startsWith(QL1S("<!")) || Qt::mightBeRichText(sstring);
+}
+
 QDateTime TextFactory::parseDateTime(const QString& date_time) {
   const QString input_date = date_time.simplified();
   QDateTime dt;

diff --git a/src/librssguard/miscellaneous/textfactory.h b/src/librssguard/miscellaneous/textfactory.h
@@ -10,7 +10,6 @@
 
 class TextFactory {
   private:
-
     // Constructors and destructors.
     TextFactory();
 
@@ -20,6 +19,8 @@ class TextFactory {
     static int stringHeight(const QString& string, const QFontMetrics& metrics);
     static int stringWidth(const QString& string, const QFontMetrics& metrics);
 
+    static bool couldBeHtml(const QString& string);
+
     // Tries to parse input textual date/time representation.
     // Returns invalid date/time if processing fails.
     // NOTE: This method tries to always return time in UTC.