diff --git a/src/mirall/owncloudinfo.cpp b/src/mirall/owncloudinfo.cpp index 820a71947e..b691152cc5 100644 --- a/src/mirall/owncloudinfo.cpp +++ b/src/mirall/owncloudinfo.cpp @@ -14,7 +14,6 @@ #include "mirall/owncloudinfo.h" #include "mirall/mirallconfigfile.h" -#include "mirall/version.h" #include "mirall/theme.h" #include "mirall/utility.h" @@ -167,9 +166,7 @@ QNetworkReply* ownCloudInfo::mkdirRequest( const QString& dir ) //connect(qhttp, SIGNAL(authenticationRequired(QString,quint16,QAuthenticator*)), this, SLOT(qhttpAuthenticationRequired(QString,quint16,QAuthenticator*))); QHttpRequestHeader header("MKCOL", QString(url.encodedPath()), 1,1); /* header */ header.setValue("Host", QString(url.encodedHost())); - header.setValue("User-Agent", QString::fromLatin1("Mozilla/5.0 (%1) mirall/%2") - .arg(Utility::platform()) - .arg(QLatin1String(MIRALL_STRINGIFY(MIRALL_VERSION))).toAscii()); + header.setValue("User-Agent", Utility::userAgentString()); header.setValue("Accept-Charset", "ISO-8859-1,utf-8;q=0.7,*;q=0.7"); header.setValue("Accept-Language", "it,de-de;q=0.8,it-it;q=0.6,en-us;q=0.4,en;q=0.2"); header.setValue("Connection", "keep-alive"); @@ -513,9 +510,7 @@ void ownCloudInfo::setupHeaders( QNetworkRequest & req, quint64 size ) QUrl url( cfgFile.ownCloudUrl( QString::null, false ) ); qDebug() << "Setting up host header: " << url.host(); req.setRawHeader( QByteArray("Host"), url.host().toUtf8() ); - req.setRawHeader( QByteArray("User-Agent"), QString::fromLatin1("Mozilla/5.0 (%1) mirall/%2") - .arg(Utility::platform()) - .arg(QLatin1String(MIRALL_STRINGIFY(MIRALL_VERSION))).toAscii()); + req.setRawHeader( QByteArray("User-Agent"), Utility::userAgentString()); QString con = _configHandle; if( con.isEmpty() ) con = DEFAULT_CONNECTION; diff --git a/src/mirall/updatedetector.cpp b/src/mirall/updatedetector.cpp index 1baaadb4c8..6a36d6c254 100644 --- a/src/mirall/updatedetector.cpp +++ b/src/mirall/updatedetector.cpp @@ -17,6 +17,7 @@ #include "mirall/version.h" #include "mirall/mirallconfigfile.h" #include "mirall/occinfo.h" +#include "mirall/utility.h" #include #include @@ -56,9 +57,13 @@ void UpdateDetector::versionCheck( Theme *theme ) } url.addQueryItem( QLatin1String("version"), ver ); url.addQueryItem( QLatin1String("platform"), platform ); - url.addQueryItem( QLatin1String("oem"), theme->appName()); + url.addQueryItem( QLatin1String("oem"), theme->appName() ); - _accessManager->get( QNetworkRequest( url )); + QNetworkRequest req( url ); + req.setRawHeader( QByteArray("Host"), url.host().toUtf8() ); + req.setRawHeader( QByteArray("User-Agent"), Utility::userAgentString() ); + + _accessManager->get( req ); } void UpdateDetector::slotOpenUpdateUrl() diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp index db8a3cea8f..8ed6b27f19 100644 --- a/src/mirall/utility.cpp +++ b/src/mirall/utility.cpp @@ -13,6 +13,8 @@ #include "utility.h" +#include "mirall/version.h" + #include #include #include @@ -115,4 +117,12 @@ QString Utility::platform() #endif } +QByteArray Utility::userAgentString() +{ + return QString::fromLatin1("Mozilla/5.0 (%1) mirall/%2") + .arg(Utility::platform()) + .arg(QLatin1String(MIRALL_STRINGIFY(MIRALL_VERSION))) + .toLatin1(); } + +} // namespace Mirall diff --git a/src/mirall/utility.h b/src/mirall/utility.h index d450511540..f9d990bbff 100644 --- a/src/mirall/utility.h +++ b/src/mirall/utility.h @@ -26,6 +26,7 @@ public: static QString formatFingerprint( const QByteArray& ); static void setupFavLink( const QString &folder ); static QString platform(); + static QByteArray userAgentString(); }; }