From e3e511dcba6d38b84d6ae4adfdea89a0af594a4b Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 29 Jan 2021 20:25:42 +0100
Subject: [PATCH] save

---
 resources/graphics/misc/freshrss.png          | Bin 0 -> 6218 bytes
 resources/graphics/misc/theoldreader.png      | Bin 0 -> 4034 bytes
 resources/rssguard.qrc                        |   2 +
 resources/scripts/7za                         |   2 +-
 .../network-web/networkfactory.cpp            |   5 +-
 .../services/greader/definitions.h            |   3 +
 .../services/greader/greadernetwork.cpp       |  77 ++++++++++++++----
 .../services/greader/greadernetwork.h         |   3 +-
 .../services/greader/greaderserviceroot.cpp   |  14 ++++
 9 files changed, 86 insertions(+), 20 deletions(-)
 create mode 100644 resources/graphics/misc/freshrss.png
 create mode 100644 resources/graphics/misc/theoldreader.png

diff --git a/resources/graphics/misc/freshrss.png b/resources/graphics/misc/freshrss.png
new file mode 100644
index 0000000000000000000000000000000000000000..c090eff0460ba2b8550d194fc7f96d88b4be25b4
GIT binary patch
literal 6218
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

literal 0
HcmV?d00001

diff --git a/resources/graphics/misc/theoldreader.png b/resources/graphics/misc/theoldreader.png
new file mode 100644
index 0000000000000000000000000000000000000000..6863efd89751c77164845b3277bfaf7afad6e144
GIT binary patch
literal 4034
zcmV;z4?XaSP)<h;3K|Lk000e1NJLTq002M$002M;0ssI2B@5<>00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRa0NJ&INRCwCVnt7B|^_9mz_jPr5Rqu^$gCSs86jwxWK|SM!nK3Bf5=Rg>Fi~ba
zC?q;+oWvzA!%U1OOh}?J#vnRz+;AC1$AbYCrCUKTu0&C`MjD!Ks+X#+es}(OOZ|SY
zUUj!;=8t*jojPy1^?Sd2fA@ax_7nG%QKa|M|DhoKe>|$|60*0I&VB#;p}sDU|2Hzp
z<q}$w5RH!LUn}$#{a)lrv9~ISgG!X3C_Ts^*i&zil0*Ul@$c0bOuHZjjSYxcf7AT;
zb--`9E<N3v?jnP_Pzq&uUo4b?+7~*QWfT%VyAcU=!IW>a;8qSC8#17A-yJ|yeL1?)
z>}lomPuSQ*^Ba7$k$ruX2b>H>)M9WWQRYM^)zjW)jgx`H4&&*yq$*<-M&op#pYP`9
z>AHNdj^`ie*+=<oD@iErm%g}~`DC^Aj)Dd@;GbD^+DuJVs&Qano42tC1|@*1f;x^K
zF-dP+q%W+~Tkh6|M%{<HaXO=T6H{Yi7#HE;2uNUIA=8qq@NOkIFs@^t#NOHhH2A4+
z;2&<3<!{T(i=+qXEwZGB>5E}I76bJ7tc5&C3A*xm0S&cZ)tike46%({L`*rEEam4D
z+<T`E|CZjjjGz5hlPT%R&oUHps7n!(3!ex$oOlvxo3#|O@->z%5#z&w#b~S;#1K-f
zEF+wlLS@#K^3e0_-$=J1c!?h>W@NWB&AfAY`4y`3Ow$Y1)jZq8sB!+H10uLCcP?bz
zyCj`r<}032c>|S~Gh`^E$8q#z#ve;{ZKzHnqN)T-$A-1cIh(I`k&I%6*!XT8we_N^
z?Axoer%3a=R2r7P56+p!Z=RJvh5X+?Js|V0q{8<eQh?&3!E^7+E+~}2$OAd^e4Txz
zj2aheX2^g5YhUA%sbsoCXhKo3z%z=dwe{kv3b6STJ?|vh-AY;T-i0hIdy$jRG|hnS
zPR=@#O`mJ|*NFubdZ7mzs`T>ta`lg>sEQ$b{C*Z*MQYGtMs2-=sw#ZzU~apQoPk^p
z+K2x7PVapvGfh=;_AJd3v1tp43r|7I&>FNW&A;8PGf&e`-&brj2L1ah^@5q2?sq8r
zbVU4Rk!iDa`gA&t1xg`rzRugP`3oH|qGx`W>Jo8d^e1o78eIY3WD`g&G&jqvGg!X{
z6LY=sZ~7VEY#<v0no{r!I3dU=$ih3Nww%6z$bk&<rw7DF5;<f%W5=-@(nuOfL)y6B
zhoqs?c%BWy5e<;B5_asAD`v>2f5E_9fT6?Xs_P|F0Pgm@L-P~Yb@LztTz@G`mwJeV
zA~|%wI$rva{fAj_^!h9OWrLJC8hQnP9aIA83uwB7&pwuS*XUn2;~?dh32G-yI8q*e
zU8`#HxFjO`+Vwk!vt^r<^%v54p#-jRsH(eejgE5M(YRxA$KsAb55Qgih^wlqA(^VW
zMNSQV^T)n+eR`>T#vwWkcMLk#A6&=c?vLKFz@qoYzvoBpP>a$$-SGLOdMD!lIqG<w
zFi|pr!xL~}^$IEQM^fa>2SWG&p;a|{&c!_S78hMYXWn8Is6roJ!bcl41PRYN&z?nX
zDQ;A4BF<RBi3VXJoIXu+hNYLmh9=EsqM%VMj58q13W2I?^`1X+*<4K<dQbxGSsuDK
zPwyRL599C&nu%ha5`E%GVT?BUbV(s5ZfyNrTDD0+JU7V0Uph~0xBW_vpD5jib*7M4
zo|auLd3sfG9GQHo<chAd5epTjQDY9Faes1wtvF~p!xx)O(OROm{Qw1`G9j4qBsVM~
zAsV7^0$SSjt(D=(esD4VI1&~@N0!1<p+w%Fd*2YDZa@9TNVe_rT)GHk&>dg;`Vbyp
zY|?daQ(6*93RS{@UKn){hflOLN`w>6;Fx21YptdNF}l#SN~g`T#4+k%DjfQJMunK<
z6G-?@z>KRzWY`FG-?1W)))on&)_eZW8*;_vRL19)UYe?9CCt5=o9`9JA+T>mIAtoU
z*GejH3A*V6KY;gU0_-<bt7~OXn>tpVK_!w8M4Xg2-60L)+6i9A-e`7LTTc~~LlR9Q
zNi+$;DM?5n^vU91^5PR3$p;QSO3DmLmLR)#k<EzVRY|6#x)#^Y2gJIKu>t=@dD2SI
z1hSc^S1&E||1EeHDpG*22@qKQQZzQJYoNpqEHhp7X07oP2};Y%<OX}{z6!<IfR}xX
zksbh!6WV~UY3fFFQ#=ER<oqrSX|U`^gj_Zn13D#0{u6k*r0#(6XreGQ2PEBLRUZ^h
zRfco(fub`lU69Ndt+cS}(F4Ql`0m{33UB*Dd!f`%8`OoW8p@LvQ8r6=7tY`q$g|<8
z;I0-zad;E2Z-}C8qErtZM@nqu2~rur6-JEZ+J9#BA=m=a=GSqJl*okxMo>~>O|7#-
zI(!Q*8Vh+0m^dw<*$g|rq{OBgI$Vw9SXDWF8mF9TgmHxx9+C2Lb9wzw?A@a)Um)p|
zDM%lB<S|~(O_*wK|B`e!B{6j^Q#%rtm+@Y-Y-RfvNf>CDgb|~~_V$uUkVvRqjl$0Q
z)JT8xrH!SFW%Ev|19}&&fD@)z^q?Palx{q-n8Y=>O<>DafcKke>m~)BLiHhy4U8Ne
zQ|c*F-<3!>WQu?N8h*8iltGq3jyi(z$42MZw3^~2;V`62L}CI3UVD)~B&hh(3kMxe
z-H@m!E-0KthKdx906tj9KVC>@H>SDv!py5EEwlV!x`XCb`2@Xqf!c}I(%Rct{gNaN
z=*_`#r+B(<g=oRAcj2kI`H<j=?;D<aSZ1HWms|1<80bdEAIy1|Ma8k^RoT2<O09G(
zwltIoVbL#dy!;fKcZLCixKJr_@^_-_yRP(RJ+X&V^q0sBC%w_K8CqLdyNV|t);C_4
z1X7Vt6zKy8ZvHuy)nXPtfX9EQZoa%#Xl51zc?He&^2c9NVvuBD!Vw%fDayc|3wdP)
z6%GLdW+_Kdf6(qOT3cw#AV|uXg7=$->#pb2vm~N&8=F}9vZV5!CCJ$esx4~TfC$el
zrFjFDmV(NRi%FDP;^}DP*=4$AH)V(&T}2>I1xk?07=WS!F20EC{w3<*K^EVpojI!P
zI=jU6ZzPCD0ru?T-diX&#NP|U>zQ#$=mGqs`^{H%`);ayLl?UOEn;K>1^oo^hRwkD
zzt8PU{0POvS?}$NC-lV^sLa!Af%7sSCPMGaoeSBtRceesbi;+;qwxSD3i`~_(2qvz
z`Vw_&)^#6rLSrqr|CCGT7s8r;wVm4*nq9A0<cY}#c;w&pv1L+aFr7t4HZW&lC|I9|
zzkZ~DULmPK5(NQJw0ozB3%$?_^(oH1K(D?@Mjv9Ymm)$g#|?A!v#nA+P;bv<KtWzz
z&MiNnJRe+(LJwT?6JPv+g9LbViR{T}O|ZlQS;*q2e-d?=l7QM;9djrrpD9x>;Go0I
zet~sy>(#ut!kc}uE>=uoOJDmh=3PKnr|&hqH~V19DLnk&B&=wUZC@~TJRKeRAg~7x
z9Kpr&IPf5=H{@NHm9yV4zA=Jf-z*~1U=eP=h9!%sD$MH!DDEcopDv@jGw<^RGB9ii
zKm9F<gjvW(gx}mnO9wT1HRHe$Ji3yRV+L2F)`<5;gswC<&*QOWR1Tt_5fhE}=E8cs
zfcAliEV`f3<3hvrz0!szee59<WF-riUacd?NTd^`12lPk#B}@Qy|vtWjlSI+mHpr<
z_CUhS7_<+%;f{aRzdJu#O33B7<663UJqEmvx0b-DapsIIuqqxe`Ow#~SAQ^D-us+}
z_`bF<P;Jz&PKS=Y8@b`fTyb5@azC(0SFMrCqE&A*E6TfeJ6^JaJXNXNk9!``QH|1N
zcg>2#wuQY)@!G7uHfQ0-cj$uK!yZ;X!dv@ietx?Lof?Q=B7Vx4Ul`cs-C18wgDoZb
z&`XtxC(47%wXwnL@M#>9MT(&jngk%7P+P?vi}n1=#RfPLp=FEw@G^R`UJeymU6bDD
zp=p)8vz9Uk5$(;=*2<18vgsq*JGgJDOgbqVZ%>#k4?fG>X|(Rvlszni$p<=M!UXR6
zH4`RBQV<0?_c4Dao4%lG0C)+j`>c41yMIBAjfV;7gYV7Y_s?<k2~qt#`UD<aE_0``
zyUj}#bkIiZ$ovKJpQ~iTWV;X~fMmM4_99vJCRH)@bgPYSX4U28R6~_@N)o9;cJ1bh
z>9YPU?Cv+JOgxF-EoVp_J^sj2(0-0x6NmXf(aP$eznfQmx;wdMmOS^oC(D7G+jcKI
zrpd05LcVI{iW#!uZL2Ba(I4|S^1#zlUrTpB7LvFK!jz*^D0qN9UvcFOo>@-KKucHz
z;NsO+Aq6|XV(tt!Hbsm<fa6Z({->#}r8~OkKs3&?X{5p7+4zU+b=DdB%BxxvEtkg@
z)6K>QMK+iC7lMLTpgVTz-0Av$bIgAypT_-9YE6x1?3h&IqEU%7I6$8KgIsu;Y}_c-
zF*~awoszts1cw&v$C844KoqG&wztUK>GHw5p(1Ip5kpU$!u?N3bq&21bgG>XXz0lN
zo9$ofg4ufQ9BtpLRWTcN3Khj%fe^t8Ti=B(4^^l{x9!k5)AhskYPU`RPWraq`+J;{
z2wW9T#_`Zb{_qRVIbQzbQAr|Y`TkPj{+C$480jN<0eJ*QqSxL!Y~3bv&gSC{R&m5T
z|Mq+)9V<Qk^_K)3o?FJbC+JNJWM>Q2Xk1EVRtLhR^!GYCj=2H~DvkuzQggZEVW0xG
zY?C=>>8I}p!L{W3SB(dFjmp9$H9GY-&S&F$QiT^$_Yb<!ZBs7N-WFYf_C1B$0{ROy
zD`4|hxqK>{J_w3QB0#2x58v|=j|hNTen3-b^6PBdF!ygb=u;0{4|lcbt1p-XYFvLV
zdRC&Fx9FUy`u;mUO*W%<{ZK#tj52HIT;cS@omej&ZT)Yl)PA<A_Mqp@lzBHWbhv)9
zQ5M}mQ?sV5fvnWIpP0D^>MEErO@=gT(`weOCpl0^U0W~iq<Y%h`gchKL?&HOouH<U
z-K}JiWKsIq$yg7)gv5n1!uosvdnFR_!)Zb9sGor<(B2%oT5%v5Qv)mv1d3JUr39*q
z(i1nPBe`5;w`RCgO$ywWHE%V>a*#y6s1Z@tV)4E5_2{LLCYMW4-ykK4cm)qC2GY-_
o!G8M#43u7dE&7<->bn0K06rLI{?D;FSO5S307*qoM6N<$g2y1cj{pDw

literal 0
HcmV?d00001

diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc
index 3c58b674a..60a4f36fd 100755
--- a/resources/rssguard.qrc
+++ b/resources/rssguard.qrc
@@ -16,11 +16,13 @@
 
         <file>graphics/misc/adblock.png</file>
         <file>graphics/misc/adblock-disabled.png</file>
+        <file>graphics/misc/freshrss.png</file>
         <file>graphics/misc/gmail.png</file>
         <file>graphics/misc/google.png</file>
         <file>graphics/misc/image-placeholder.png</file>
         <file>graphics/misc/inoreader.png</file>
         <file>graphics/misc/nextcloud.png</file>
+        <file>graphics/misc/theoldreader.png</file>
         <file>graphics/misc/tt-rss.png</file>
         
         <file>graphics/misc/flags/cs.png</file>
diff --git a/resources/scripts/7za b/resources/scripts/7za
index 47f412575..9c10723bf 160000
--- a/resources/scripts/7za
+++ b/resources/scripts/7za
@@ -1 +1 @@
-Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9
+Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749
diff --git a/src/librssguard/network-web/networkfactory.cpp b/src/librssguard/network-web/networkfactory.cpp
index 57a6221d4..2e84624a0 100644
--- a/src/librssguard/network-web/networkfactory.cpp
+++ b/src/librssguard/network-web/networkfactory.cpp
@@ -137,8 +137,9 @@ QString NetworkFactory::networkErrorText(QNetworkReply::NetworkError error_code)
   }
 }
 
-QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList<QString>& urls, int timeout, QIcon& output, const QNetworkProxy& custom_proxy) {
-  QNetworkReply::NetworkError network_result = QNetworkReply::UnknownNetworkError;
+QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList<QString>& urls, int timeout,
+                                                         QIcon& output, const QNetworkProxy& custom_proxy) {
+  QNetworkReply::NetworkError network_result = QNetworkReply::NetworkError::UnknownNetworkError;
 
   for (const QString& url : urls) {
     QByteArray icon_data;
diff --git a/src/librssguard/services/greader/definitions.h b/src/librssguard/services/greader/definitions.h
index 4249394ae..f7f75a923 100755
--- a/src/librssguard/services/greader/definitions.h
+++ b/src/librssguard/services/greader/definitions.h
@@ -23,6 +23,9 @@
 #define GREADER_API_EDIT_TAG_BATCH      200
 #define GREADER_API_ANY_LABEL           "user/-/label"
 
+// The Old Reader.
+#define TOR_SPONSORED_STREAM_ID   "tor/sponsored"
+
 // FreshRSS.
 #define FRESHRSS_BASE_URL_PATH    "api/greader.php/"
 
diff --git a/src/librssguard/services/greader/greadernetwork.cpp b/src/librssguard/services/greader/greadernetwork.cpp
index 98bc7b87e..cb709bc59 100755
--- a/src/librssguard/services/greader/greadernetwork.cpp
+++ b/src/librssguard/services/greader/greadernetwork.cpp
@@ -179,18 +179,42 @@ RootItem* GreaderNetwork::categoriesFeedsLabelsTree(bool obtain_icons, const QNe
     return nullptr;
   }
 
-  auto root = decodeTagsSubscriptions(output_labels, output_feeds, obtain_icons);
-
-  return root;
+  return decodeTagsSubscriptions(output_labels, output_feeds, obtain_icons, proxy);
 }
 
-RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, const QString& feeds, bool obtain_icons) {
+RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, const QString& feeds,
+                                                  bool obtain_icons, const QNetworkProxy& proxy) {
   auto* parent = new RootItem();
   auto timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
-  QJsonArray json = QJsonDocument::fromJson(categories.toUtf8()).object()["tags"].toArray();
   QMap<QString, RootItem*> cats;
   QList<RootItem*> lbls;
+  QJsonArray json;
 
+  if (m_service == GreaderServiceRoot::Service::Bazqux) {
+    // We need to process subscription list first and extract categories.
+    json = QJsonDocument::fromJson(feeds.toUtf8()).object()["subscriptions"].toArray();
+
+    for (const QJsonValue& feed : json) {
+      auto subscription = feed.toObject();
+
+      for (const QJsonValue& cat : subscription["categories"].toArray()) {
+        auto cat_obj = cat.toObject();
+        auto cat_id = simplifyStreamId(cat_obj["id"].toString());
+
+        if (!cats.contains(cat_id)) {
+          auto* category = new Category();
+
+          category->setTitle(cat_id.mid(cat_id.lastIndexOf(QL1C('/')) + 1));
+          category->setCustomId(cat_id);
+
+          cats.insert(category->customId(), category);
+          parent->appendChild(category);
+        }
+      }
+    }
+  }
+
+  json = QJsonDocument::fromJson(categories.toUtf8()).object()["tags"].toArray();
   cats.insert(QString(), parent);
 
   for (const QJsonValue& obj : json) {
@@ -218,6 +242,19 @@ RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, con
       new_lbl->setCustomId(label_id);
       lbls.append(new_lbl);
     }
+    else if (m_service == GreaderServiceRoot::Service::Bazqux &&
+             label_id.contains(QSL("/label/"))) {
+      label_id = simplifyStreamId(label_id);
+
+      if (!cats.contains(label_id)) {
+        // This stream is not a category, it is label, bitches!
+        QString plain_name = QRegularExpression(".+\\/([^\\/]+)").match(label_id).captured(1);
+        auto* new_lbl = new Label(plain_name, TextFactory::generateColorFromText(label_id));
+
+        new_lbl->setCustomId(label_id);
+        lbls.append(new_lbl);
+      }
+    }
   }
 
   json = QJsonDocument::fromJson(feeds.toUtf8()).object()["subscriptions"].toArray();
@@ -230,11 +267,15 @@ RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, con
     QString parent_label;
     QJsonArray assigned_categories = subscription["categories"].toArray();
 
+    if (id.startsWith(TOR_SPONSORED_STREAM_ID)) {
+      continue;
+    }
+
     for (const QJsonValue& cat : assigned_categories) {
       QString potential_id = cat.toObject()["id"].toString();
 
       if (potential_id.contains(QSL("/label/"))) {
-        parent_label = potential_id;
+        parent_label = m_service == GreaderServiceRoot::Service::Bazqux ? simplifyStreamId(potential_id) : potential_id;
         break;
       }
     }
@@ -248,7 +289,9 @@ RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, con
     feed->setCustomId(id);
 
     if (obtain_icons) {
-      QString icon_url = subscription["iconUrl"].toString();
+      QString icon_url = subscription.contains(QSL("iconUrl"))
+                         ? subscription["iconUrl"].toString()
+                         : subscription["htmlUrl"].toString();
 
       if (!icon_url.isEmpty()) {
         QByteArray icon_data;
@@ -257,15 +300,13 @@ RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, con
           icon_url = QUrl(baseUrl()).scheme() + QSL(":") + icon_url;
         }
 
-        if (NetworkFactory::performNetworkOperation(icon_url, timeout,
-                                                    {}, icon_data,
-                                                    QNetworkAccessManager::Operation::GetOperation).first ==
-            QNetworkReply::NetworkError::NoError) {
-          // Icon downloaded, set it up.
-          QPixmap icon_pixmap;
+        QIcon icon;
 
-          icon_pixmap.loadFromData(icon_data);
-          feed->setIcon(QIcon(icon_pixmap));
+        if (NetworkFactory::downloadIcon({ icon_url },
+                                         timeout,
+                                         icon,
+                                         proxy) == QNetworkReply::NetworkError::NoError) {
+          feed->setIcon(icon);
         }
       }
     }
@@ -378,7 +419,7 @@ QString GreaderNetwork::serviceToString(GreaderServiceRoot::Service service) {
       return QSL("Bazqux");
 
     case GreaderServiceRoot::Service::TheOldReader:
-      return QSL("TheOldReader");
+      return QSL("The Old Reader");
 
     default:
       return tr("Unknown service");
@@ -408,6 +449,10 @@ bool GreaderNetwork::ensureLogin(const QNetworkProxy& proxy, QNetworkReply::Netw
   return true;
 }
 
+QString GreaderNetwork::simplifyStreamId(const QString& stream_id) const {
+  return QString(stream_id).replace(QRegularExpression("\\/\\d+\\/"), QSL("/-/"));
+}
+
 QList<Message> GreaderNetwork::decodeStreamContents(ServiceRoot* root,
                                                     const QString& stream_json_data,
                                                     const QString& stream_id) {
diff --git a/src/librssguard/services/greader/greadernetwork.h b/src/librssguard/services/greader/greadernetwork.h
index 5574082ba..a203cf55a 100755
--- a/src/librssguard/services/greader/greadernetwork.h
+++ b/src/librssguard/services/greader/greadernetwork.h
@@ -70,8 +70,9 @@ class GreaderNetwork : public QObject {
     // Make sure we are logged in and if we are not, return error.
     bool ensureLogin(const QNetworkProxy& proxy, QNetworkReply::NetworkError* output = nullptr);
 
+    QString simplifyStreamId(const QString& stream_id) const;
     QList<Message> decodeStreamContents(ServiceRoot* root, const QString& stream_json_data, const QString& stream_id);
-    RootItem* decodeTagsSubscriptions(const QString& categories, const QString& feeds, bool obtain_icons);
+    RootItem* decodeTagsSubscriptions(const QString& categories, const QString& feeds, bool obtain_icons, const QNetworkProxy& proxy);
     QString sanitizedBaseUrl() const;
     QString generateFullUrl(Operations operation) const;
 
diff --git a/src/librssguard/services/greader/greaderserviceroot.cpp b/src/librssguard/services/greader/greaderserviceroot.cpp
index 026b13a18..dc2022e0f 100755
--- a/src/librssguard/services/greader/greaderserviceroot.cpp
+++ b/src/librssguard/services/greader/greaderserviceroot.cpp
@@ -142,6 +142,20 @@ void GreaderServiceRoot::saveAllCachedData(bool ignore_errors) {
 void GreaderServiceRoot::updateTitle() {
   setTitle(QString("%1 (%2)").arg(m_network->username(),
                                   m_network->serviceToString(m_network->service())));
+
+  switch (m_network->service()) {
+    case Service::TheOldReader:
+      setIcon(qApp->icons()->miscIcon(QSL("theoldreader")));
+      break;
+
+    case Service::FreshRss:
+      setIcon(qApp->icons()->miscIcon(QSL("freshrss")));
+      break;
+
+    default:
+      setIcon(GreaderEntryPoint().icon());
+      break;
+  }
 }
 
 void GreaderServiceRoot::saveAccountDataToDatabase(bool creating_new) {