Append api version 2.0 to all request, if not explicitly specified

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index d52a992..4568ca1 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -103,7 +103,7 @@ QString FacebookAuthentication::parseSession(const QUrl &url)
     int end = urlString.indexOf(END, begin);
 
     if ((begin > -1) && (end > -1))
-        return urlString.mid(begin, end - begin +1);
+        return urlString.mid(begin, end - begin + 1);
     else
         return QString();
 }

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index a125334..517758f 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -21,11 +21,11 @@
 
 #include "parser.h"
 
-#include <QtAlgorithms>
 #include <QDebug>
 #include <QNetworkReply>
 #include <QPixmap>
 #include <QStringList>
+#include <QtAlgorithms>
 #include <QtGlobal>
 
 #include "error.h"
@@ -90,10 +90,17 @@ void SituareService::buildRequest(const QString &script, const QHash<QString, QS
 {
     qWarning() << __PRETTY_FUNCTION__;
 
+    const QString PARAMETER_KEY_API = "api";
+    const QString PARAMETER_VALUE_API = "2.0";
+
     QString url = SITUARE_URL;
     url.append(script);
     url.append("?");
 
+    // append default api version parameter if not yet specified
+    if (!parameters.contains(PARAMETER_KEY_API))
+        url.append(PARAMETER_KEY_API + "=" + PARAMETER_VALUE_API + "&");
+
     // append parameters
     if (!parameters.isEmpty()) {
         QHash<QString, QString>::const_iterator i = parameters.constBegin();
@@ -301,6 +308,8 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    qWarning() << __PRETTY_FUNCTION__ << "Server reply:" << jsonReply;
+
     m_defaultImage = false;
 
     QJson::Parser parser;
@@ -530,7 +539,7 @@ void SituareService::sendRequest(const QUrl &url, const QString &cookieType, con
 
 void SituareService::sendRequest(const QString &requestUrl)
 {
-    qWarning() << __PRETTY_FUNCTION__ << requestUrl;
+    qWarning() << __PRETTY_FUNCTION__ << "requestUrl" << requestUrl;
 
     // make and send the request
     QNetworkRequest request;