From e7b1c4b6d9f3759b8a5653f8f4ca8328e82ad37b Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Mon, 29 Mar 2021 09:09:07 +0200
Subject: [PATCH] save

---
 resources/desktop/com.github.rssguard.appdata.xml         | 2 +-
 src/librssguard/definitions/definitions.h                 | 5 +++++
 src/librssguard/network-web/oauthhttphandler.cpp          | 2 +-
 src/librssguard/services/standard/standardserviceroot.cpp | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index fcd423ad7..bf1c7fe3a 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.9.0" date="2021-03-23"/>
+    <release version="3.9.0" date="2021-03-29"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h
index 97d3fca3b..5c9dd70cb 100755
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -30,8 +30,13 @@
 
 #define URI_SCHEME_FEED_SHORT                 "feed:"
 #define URI_SCHEME_FEED                       "feed://"
+
+#define URI_SCHEME_HTTP_SHORT                 "http:"
 #define URI_SCHEME_HTTP                       "http://"
 
+#define URI_SCHEME_HTTPS_SHORT                "https:"
+#define URI_SCHEME_HTTPS                      "https://"
+
 #define DEFAULT_LOCALE                        "en"
 
 #define NO_PARENT_CATEGORY                    -1
diff --git a/src/librssguard/network-web/oauthhttphandler.cpp b/src/librssguard/network-web/oauthhttphandler.cpp
index f3bae7233..33f9c3023 100644
--- a/src/librssguard/network-web/oauthhttphandler.cpp
+++ b/src/librssguard/network-web/oauthhttphandler.cpp
@@ -149,7 +149,7 @@ void OAuthHttpHandler::answerClient(QTcpSocket* socket, const QUrl& url) {
 
 void OAuthHttpHandler::readReceivedData(QTcpSocket* socket) {
   if (!m_connectedClients.contains(socket)) {
-    m_connectedClients[socket].m_address = QSL("http://") + m_httpServer.serverAddress().toString();
+    m_connectedClients[socket].m_address = QSL(URI_SCHEME_HTTP) + m_httpServer.serverAddress().toString();
     m_connectedClients[socket].m_port = m_httpServer.serverPort();
   }
 
diff --git a/src/librssguard/services/standard/standardserviceroot.cpp b/src/librssguard/services/standard/standardserviceroot.cpp
index fb0e1e570..9d9a27e85 100644
--- a/src/librssguard/services/standard/standardserviceroot.cpp
+++ b/src/librssguard/services/standard/standardserviceroot.cpp
@@ -283,7 +283,8 @@ QString StandardServiceRoot::processFeedUrl(const QString& feed_url) {
   if (feed_url.startsWith(QL1S(URI_SCHEME_FEED_SHORT))) {
     QString without_feed_prefix = feed_url.mid(QSL(URI_SCHEME_FEED_SHORT).size());
 
-    if (without_feed_prefix.startsWith(QL1S("https:")) || without_feed_prefix.startsWith(QL1S("http:"))) {
+    if (without_feed_prefix.startsWith(QL1S(URI_SCHEME_HTTPS_SHORT)) ||
+        without_feed_prefix.startsWith(QL1S(URI_SCHEME_HTTP_SHORT))) {
       return without_feed_prefix;
     }
     else {