Merge branch 'master' into login_browser

[situare] / src / situareservice / situareservice.cpp

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index b14b8f7..87847c4 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -19,13 +19,13 @@
    USA.
 */
 
-#include "parser.h"
+#include <qjson/parser.h>
 
-#include <QtAlgorithms>
 #include <QDebug>
 #include <QNetworkReply>
 #include <QPixmap>
 #include <QStringList>
+#include <QtAlgorithms>
 #include <QtGlobal>
 
 #include "error.h"
@@ -81,7 +81,7 @@ void SituareService::appendAccessToken(QString &requestUrl)
     qWarning() << __PRETTY_FUNCTION__;
 
 //    requestUrl.append("access_token=");
-    requestUrl.append(m_accessToken);
+    requestUrl.append(m_session);
 
 //    qWarning() << __PRETTY_FUNCTION__ << "request url with parameters and access token:" << requestUrl;
 }
@@ -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();
@@ -108,7 +115,7 @@ void SituareService::buildRequest(const QString &script, const QHash<QString, QS
 
 //    qWarning() << __PRETTY_FUNCTION__ << "request url with parameters:" << url;
 
-    if (!m_accessToken.isEmpty()) {
+    if (!m_session.isEmpty()) {
         appendAccessToken(url);
         sendRequest(url);
     } else {
@@ -131,13 +138,6 @@ void SituareService::clearUserData()
     emit userDataChanged(m_user, m_friendsList);
 }
 
-void SituareService::credentialsReady(const FacebookCredentials &credentials)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_credentials = credentials;
-}
-
 QString SituareService::degreesToString(double degrees)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -308,6 +308,8 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    qWarning() << __PRETTY_FUNCTION__ << "Server reply:" << jsonReply;
+
     m_defaultImage = false;
 
     QJson::Parser parser;
@@ -537,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;
@@ -547,11 +549,11 @@ void SituareService::sendRequest(const QString &requestUrl)
     m_currentRequests.append(reply);
 }
 
-void SituareService::updateAccessToken(const QString &accessToken)
+void SituareService::updateSession(const QString &session)
 {
     qWarning() << __PRETTY_FUNCTION__;
 
-    m_accessToken = accessToken;
+    m_session = session;
 
     foreach (QString request, m_requestsWaitingAccessToken) {
         appendAccessToken(request);