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/services/feedly/feedlynetwork.cpp b/src/librssguard/services/feedly/feedlynetwork.cpp index 4b1db8d70..a7c01cb0a 100755 --- a/src/librssguard/services/feedly/feedlynetwork.cpp +++ b/src/librssguard/services/feedly/feedlynetwork.cpp @@ -68,6 +68,8 @@ QString FeedlyNetwork::profile(const QNetworkProxy& network_proxy) { {}, {}, network_proxy); + + return output_msgs; } } @@ -136,6 +138,16 @@ void FeedlyNetwork::onTokensReceived(const QString& access_token, const QString& } } +OAuth2Service* FeedlyNetwork::oauth() const { + return m_oauth; +} + +void FeedlyNetwork::setOauth(OAuth2Service* oauth) { + m_oauth = oauth; +} + +#endif + QString FeedlyNetwork::fullUrl(FeedlyNetwork::Service service) const { switch (service) { case FeedlyNetwork::Service::Profile: @@ -157,16 +169,6 @@ QPair FeedlyNetwork::bearerHeader(const QString& bearer) return { QString(HTTP_HEADERS_AUTHORIZATION).toLocal8Bit(), bearer.toLocal8Bit() }; } -OAuth2Service* FeedlyNetwork::oauth() const { - return m_oauth; -} - -void FeedlyNetwork::setOauth(OAuth2Service* oauth) { - m_oauth = oauth; -} - -#endif - void FeedlyNetwork::setService(FeedlyServiceRoot* service) { m_service = service; }