From afd999194e6fc2fdc764532bfe5baed561eb8f28 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Thu, 2 Sep 2021 11:12:33 +0200
Subject: [PATCH] add more proxy logging

---
 resources/desktop/com.github.rssguard.appdata.xml   |  2 +-
 src/librssguard/definitions/definitions.h           |  1 +
 .../network-web/basenetworkaccessmanager.cpp        | 11 +++++++++++
 src/librssguard/network-web/downloader.cpp          |  6 +++++-
 src/librssguard/network-web/webfactory.cpp          | 13 +++++++++++--
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 17c628a00..bb87a39ad 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="4.0.0" date="2021-08-31"/>
+    <release version="4.0.0" date="2021-09-02"/>
   </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 371d7b184..42c6b17b6 100644
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -311,6 +311,7 @@
 
 #define NONQUOTE_W_SPACE_DOT(x) " " << (x) << "."
 #define QUOTE_W_SPACE_DOT(x) " '" << (x) << "'."
+#define QUOTE_W_SPACE_COMMA(x) " '" << (x) << "',"
 #define QUOTE_W_SPACE(x) " '" << (x) << "' "
 #define QUOTE_NO_SPACE(x) "'" << (x) << "'"
 
diff --git a/src/librssguard/network-web/basenetworkaccessmanager.cpp b/src/librssguard/network-web/basenetworkaccessmanager.cpp
index 8894af97b..c2e33eb5c 100644
--- a/src/librssguard/network-web/basenetworkaccessmanager.cpp
+++ b/src/librssguard/network-web/basenetworkaccessmanager.cpp
@@ -26,6 +26,17 @@ void BaseNetworkAccessManager::loadSettings() {
     setProxy(QNetworkProxy::ProxyType::NoProxy);
   }
   else {
+    qWarningNN << LOGSEC_NETWORK << "Using application-wide proxy.";
+
+    if (QNetworkProxy::applicationProxy().type() != QNetworkProxy::ProxyType::DefaultProxy &&
+        QNetworkProxy::applicationProxy().type() != QNetworkProxy::ProxyType::NoProxy) {
+      qWarningNN << LOGSEC_NETWORK
+                 << "Used proxy address:"
+                 << QUOTE_W_SPACE_COMMA(QNetworkProxy::applicationProxy().hostName())
+                 << " type:"
+                 << QUOTE_W_SPACE_DOT(QNetworkProxy::applicationProxy().type());
+    }
+
     setProxy(QNetworkProxy::applicationProxy());
   }
 
diff --git a/src/librssguard/network-web/downloader.cpp b/src/librssguard/network-web/downloader.cpp
index 498374543..a9a184ec6 100644
--- a/src/librssguard/network-web/downloader.cpp
+++ b/src/librssguard/network-web/downloader.cpp
@@ -296,7 +296,11 @@ QVariant Downloader::lastContentType() const {
 }
 
 void Downloader::setProxy(const QNetworkProxy& proxy) {
-  qWarningNN << LOGSEC_NETWORK << "Setting custom proxy:" << QUOTE_W_SPACE_DOT(proxy.hostName());
+  qWarningNN << LOGSEC_NETWORK
+             << "Setting specific downloader proxy, address:"
+             << QUOTE_W_SPACE_COMMA(proxy.hostName())
+             << " type:"
+             << QUOTE_W_SPACE_DOT(proxy.type());
 
   m_downloadManager->setProxy(proxy);
 }
diff --git a/src/librssguard/network-web/webfactory.cpp b/src/librssguard/network-web/webfactory.cpp
index c23d4c747..7f9921249 100644
--- a/src/librssguard/network-web/webfactory.cpp
+++ b/src/librssguard/network-web/webfactory.cpp
@@ -222,10 +222,13 @@ void WebFactory::updateProxy() {
                                                                                              toInt());
 
   if (selected_proxy_type == QNetworkProxy::NoProxy) {
+    qDebugNN << LOGSEC_NETWORK << "Disabling application-wide proxy completely.";
+
     QNetworkProxyFactory::setUseSystemConfiguration(false);
-    QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);
+    QNetworkProxy::setApplicationProxy(QNetworkProxy::ProxyType::NoProxy);
   }
-  else if (selected_proxy_type == QNetworkProxy::DefaultProxy) {
+  else if (selected_proxy_type == QNetworkProxy::ProxyType::DefaultProxy) {
+    qDebugNN << LOGSEC_NETWORK << "Using application-wide proxy to be system's default proxy.";
     QNetworkProxyFactory::setUseSystemConfiguration(true);
   }
   else {
@@ -239,6 +242,12 @@ void WebFactory::updateProxy() {
     new_proxy.setUser(settings->value(GROUP(Proxy), SETTING(Proxy::Username)).toString());
     new_proxy.setPassword(settings->password(GROUP(Proxy), SETTING(Proxy::Password)).toString());
 
+    qWarningNN << LOGSEC_NETWORK
+               << "Activating application-wide custom proxy, address:"
+               << QUOTE_W_SPACE_COMMA(new_proxy.hostName())
+               << " type:"
+               << QUOTE_W_SPACE_DOT(new_proxy.type());
+
     QNetworkProxy::setApplicationProxy(new_proxy);
   }
 }