X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fsituareservice%2Fsituareservice.cpp;h=aee9f8eb7a7c5929d87c9932937dcd631fca9346;hb=bc319a7c2e5b4b6c918f567299e0f224e0e11bc0;hp=cdd921f06f10175a9c4a7a0d1f97612bf4558655;hpb=ecf52e2fa5cb91d5fea1bbe27d0b6ff765e97745;p=situare

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index cdd921f..aee9f8e 100644
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -3,6 +3,7 @@
    Copyright (C) 2010  Ixonos Plc. Authors:
 
       Henri Lampela - henri.lampela@ixonos.com
+      Sami Rämö - sami.ramo@ixonos.com
 
    Situare is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -19,18 +20,21 @@
    USA.
 */
 
-#include <QtAlgorithms>
+#include <qjson/parser.h>
+
 #include <QDebug>
-#include <QtGlobal>
-#include <QStringList>
-#include <QPixmap>
 #include <QNetworkReply>
-#include "situareservice.h"
+#include <QPixmap>
+#include <QStringList>
+#include <QtAlgorithms>
+#include <QtGlobal>
+
+#include "../error.h"
+#include "network/networkaccessmanager.h"
 #include "situarecommon.h"
-#include "common.h"
-#include "parser.h"
 #include "ui/avatarimage.h"
-#include "network/networkaccessmanager.h"
+
+#include "situareservice.h"
 
 SituareService::SituareService(QObject *parent)
         : QObject(parent),
@@ -38,17 +42,17 @@ SituareService::SituareService(QObject *parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_networkManager = NetworkAccessManager::instance();
+    m_networkManager = new NetworkAccessManager(this);
     connect(m_networkManager, SIGNAL(finished(QNetworkReply*)),
-            this, SLOT(requestFinished(QNetworkReply*)));
+            this, SLOT(requestFinished(QNetworkReply*)), Qt::QueuedConnection);
 
-    m_imageFetcher = new ImageFetcher(NetworkAccessManager::instance(), this);
+    m_imageFetcher = new ImageFetcher(new NetworkAccessManager(this), this);
     connect(this, SIGNAL(fetchImage(QUrl)),
             m_imageFetcher, SLOT(fetchImage(QUrl)));
     connect(m_imageFetcher, SIGNAL(imageReceived(QUrl,QPixmap)),
             this, SLOT(imageReceived(QUrl, QPixmap)));
-    connect(m_imageFetcher, SIGNAL(error(QString)),
-            this, SIGNAL(error(QString)));
+    connect(m_imageFetcher, SIGNAL(error(int, int)),
+            this, SIGNAL(error(int, int)));
 }
 
 SituareService::~SituareService()
@@ -64,178 +68,286 @@ SituareService::~SituareService()
     m_friendsList.clear();
 }
 
-void SituareService::fetchLocations()
+void SituareService::addProfileImages(const QList<QUrl> &imageUrlList)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString cookie = formCookie(API_KEY, m_credentials.expires(), m_credentials.userID(),
-                                m_credentials.sessionKey(), m_credentials.sessionSecret(),
-                                m_credentials.sig(), EN_LOCALE);
-
-    QUrl url = formUrl(SITUARE_URL, GET_LOCATIONS);
-    sendRequest(url, COOKIE, cookie);
+    foreach(QUrl url, imageUrlList) {
+        emit fetchImage(url);
+    }
 }
 
-void SituareService::reverseGeo(const QPointF &coordinates)
+void SituareService::appendAccessToken(QString &requestUrl)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString cookie = formCookie(API_KEY, m_credentials.expires(),m_credentials.userID(),
-                                m_credentials.sessionKey(), m_credentials.sessionSecret(),
-                                m_credentials.sig(), EN_LOCALE);
-
-    QString urlParameters = formUrlParameters(coordinates);
-    QUrl url = formUrl(SITUARE_URL, REVERSE_GEO, urlParameters);
-
-    sendRequest(url, COOKIE, cookie);
+    requestUrl.append(m_session);
 }
 
-void SituareService::updateLocation(const QPointF &coordinates, const QString &status,
-                                    const bool &publish)
+void SituareService::buildRequest(const QString &script, const QHash<QString, QString> &parameters)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString cookie = formCookie(API_KEY, m_credentials.expires(), m_credentials.userID(),
-                                m_credentials.sessionKey(), m_credentials.sessionSecret(),
-                                m_credentials.sig(), EN_LOCALE);
+    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();
+        while (i != parameters.constEnd()) {
+            url.append(i.key());
+            url.append("=");
+            url.append(i.value());
+            url.append("&");
+            i++;
+        }
+    }
 
+    /// @todo BUG: Url parameter strings are not url escaped
 
-    QString publishValue;
-    if(publish) {
-        publishValue = PUBLISH_TRUE;
-    }
-    else {
-        publishValue = PUBLISH_FALSE;
-    }
-    QString urlParameters = formUrlParameters(coordinates, status, publishValue);
-    QUrl url = formUrl(SITUARE_URL, UPDATE_LOCATION, urlParameters);
+//    qWarning() << __PRETTY_FUNCTION__ << "request url with parameters:" << url;
 
-    sendRequest(url, COOKIE, cookie);
+    if (!m_session.isEmpty()) {
+        appendAccessToken(url);
+        sendRequest(url);
+    } else {
+        emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED);
+    }
 }
 
-QString SituareService::formCookie(const QString &apiKeyValue, QString expiresValue,
-                                   QString userValue, QString sessionKeyValue,
-                                   QString sessionSecretValue, const QString &signatureValue,
-                                   const QString &localeValue)
+void SituareService::clearUserData()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString cookie;
-    QString apiKey;
-    QString user;
-    QString expires;
-    QString sessionKey;
-    QString sessionSecret;
-    QString locale;
-    QString variable;
-    QString signature = EQUAL_MARK;
-    QStringList variableList;
-
-    signature.append(signatureValue);
-    apiKey.append(apiKeyValue);
-    apiKey.append(UNDERLINE_MARK);
-
-    user.append(USER);
-    user.append(EQUAL_MARK);
-    expires.append(EXPIRES);
-    expires.append(EQUAL_MARK);
-    sessionKey.append(SESSION_KEY);
-    sessionKey.append(EQUAL_MARK);
-    sessionSecret.append(SESSION_SECRET);
-    sessionSecret.append(EQUAL_MARK);
-    locale.append(LOCALE);
-    locale.append(EQUAL_MARK);
-    locale.append(localeValue);
-
-    variableList.append(expires.append(expiresValue.append(BREAK_MARK)));
-    variableList.append(sessionKey.append(sessionKeyValue.append(BREAK_MARK)));
-    variableList.append(user.append(userValue).append(BREAK_MARK));
-    variableList.append(sessionSecret.append(sessionSecretValue.append(BREAK_MARK)));
-
-    cookie.append(BREAK_MARK);
-
-    foreach(variable, variableList) {
-        cookie.append(apiKey);
-        cookie.append(variable);
-    }
-    apiKey.remove(UNDERLINE_MARK);
-    cookie.append(apiKey);
-    cookie.append(signature);
-    cookie.append(BREAK_MARK);
-    cookie.append(locale);
-
-    qDebug() << cookie;
+    qDeleteAll(m_friendsList.begin(), m_friendsList.end());
+    m_friendsList.clear();
 
-    return cookie;
+    if(m_user) {
+        delete m_user;
+        m_user = 0;
+    }
+    emit userDataChanged(m_user, m_friendsList);
 }
 
-QUrl SituareService::formUrl(const QString &baseUrl, const QString &phpScript,
-                             QString urlParameters)
+QString SituareService::degreesToString(double degrees)
 {
     qDebug() << __PRETTY_FUNCTION__;
-    QString urlString;
 
-    urlString.append(baseUrl);
-    urlString.append(phpScript);
-    if(!urlParameters.isEmpty())
-        urlString.append(urlParameters);
+    // one scene pixel is about 5.4e-6 degrees, the integer part is max three digits and one
+    // additional digit is added for maximum precision
+    const int PRECISION = 10;
 
-    QUrl url = QUrl(urlString);
+    return QString::number(degrees, 'f', PRECISION);
+}
 
-    qDebug() << url;
+void SituareService::fetchLocations()
+{
+    qDebug() << __PRETTY_FUNCTION__;
 
-    return url;
+    QHash<QString, QString> parameters;
+    parameters.insert("extra_user_data", NORMAL_SIZE_PROFILE_IMAGE);
+
+    buildRequest(GET_LOCATIONS, parameters);
 }
 
-QString SituareService::formUrlParameters(const QPointF &coordinates, QString status,
-                                          QString publish)
+void SituareService::imageReceived(const QUrl &url, const QPixmap &image)
 {
-    QString parameters;
-
-    parameters.append(QUESTION_MARK);
-    parameters.append(LATITUDE);
-    parameters.append(EQUAL_MARK);
-    parameters.append(QString::number(coordinates.y()));
-    parameters.append(AMBERSAND_MARK);
-    parameters.append(LONGTITUDE);
-    parameters.append(EQUAL_MARK);
-    parameters.append(QString::number(coordinates.x()));
-
-    if(publish.compare(PUBLISH_TRUE) == 0) {
-        parameters.append(AMBERSAND_MARK);
-        parameters.append(PUBLISH);
-        parameters.append(EQUAL_MARK);
-        parameters.append(PUBLISH_TRUE);
-    } else if(publish.compare(PUBLISH_FALSE) == 0) {
-        parameters.append(AMBERSAND_MARK);
-        parameters.append(PUBLISH);
-        parameters.append(EQUAL_MARK);
-        parameters.append(PUBLISH_FALSE);
+    qDebug() << __PRETTY_FUNCTION__;
+    qDebug() << "Image URL: " << url << " size :" << image.size();
+
+    // assign facebook silhouette image to all who doesn't have a profile image
+    if(url == QUrl(SILHOUETTE_URL)) {
+        if(m_user->profileImageUrl().isEmpty()) {
+            m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large));
+            emit imageReady(m_user);
+        }
+        foreach(User *friendItem, m_friendsList) {
+            if(friendItem->profileImageUrl().isEmpty()) {
+                friendItem->setProfileImage(AvatarImage::create(image, AvatarImage::Small));
+                emit imageReady(friendItem);
+            }
+        }
     }
 
-    if(!status.isEmpty()) {
-        parameters.append(AMBERSAND_MARK);
-        parameters.append(DATA);
-        parameters.append(EQUAL_MARK);
-        parameters.append(status);
+    if (m_user->profileImageUrl() == url) {
+        m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large));
+        emit imageReady(m_user);
     }
 
-    return parameters;
+    foreach(User *friendItem, m_friendsList) {
+        if(friendItem->profileImageUrl() == url) {
+            friendItem->setProfileImage(AvatarImage::create(image, AvatarImage::Small));
+            emit imageReady(friendItem);
+        }
+    }
 }
 
-void SituareService::sendRequest(const QUrl &url, const QString &cookieType, const QString &cookie)
+void SituareService::parseUserData(const QByteArray &jsonReply)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QNetworkRequest request;
+    m_defaultImage = false;
 
-    request.setUrl(url);
-    request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
-    request.setRawHeader(cookieType.toAscii(), cookie.toUtf8());
+    QJson::Parser parser;
+    bool ok;
 
-    QNetworkReply *reply = m_networkManager->get(request);
+    QVariantMap result = parser.parse (jsonReply, &ok).toMap();
+    if (!ok) {
+        emit error(ErrorContext::SITUARE, SituareError::INVALID_JSON);
+        return;
+    } else {
 
-    m_currentRequests.append(reply);
+        if(result.contains("ErrorCode")) {
+            QVariant errorVariant = result.value("ErrorCode");
+            emit error(ErrorContext::SITUARE, errorVariant.toInt());
+            return;
+        } else if(result.contains("user")) {
+
+            QVariant userVariant = result.value("user");
+            QMap<QString, QVariant> userMap = userVariant.toMap();
+
+            GeoCoordinate coordinates(userMap["latitude"].toReal(), userMap["longitude"].toReal());
+
+            QUrl imageUrl = userMap[NORMAL_SIZE_PROFILE_IMAGE].toUrl();
+
+            if(imageUrl.isEmpty()) {
+                // user doesn't have profile image, so we need to get him a silhouette image
+                m_defaultImage = true;
+            }
+
+            QString address = userMap["address"].toString();
+            if(address.isEmpty()) {
+                QStringList location;
+                location.append(QString::number(coordinates.latitude()));
+                location.append(QString::number(coordinates.longitude()));
+                address = location.join(", ");
+            }
+
+            User user = User(address, coordinates, userMap["name"].toString(),
+                          userMap["note"].toString(), imageUrl, userMap["timestamp"].toString(),
+                          true, userMap["uid"].toString());
+
+            QList<User> tmpFriendsList;
+
+            foreach (QVariant friendsVariant, result["friends"].toList()) {
+              QMap<QString, QVariant> friendMap = friendsVariant.toMap();
+              QVariant distance = friendMap["distance"];
+              QMap<QString, QVariant> distanceMap = distance.toMap();
+
+              GeoCoordinate coordinates(friendMap["latitude"].toReal(),friendMap["longitude"].toReal());
+
+              QUrl imageUrl = friendMap["profile_pic"].toUrl();
+
+              if(imageUrl.isEmpty()) {
+                  // friend doesn't have profile image, so we need to get him a silhouette image
+                  m_defaultImage = true;
+              }
+
+              QString address = friendMap["address"].toString();
+              if(address.isEmpty()) {
+                  QStringList location;
+                  location.append(QString::number(coordinates.latitude()));
+                  location.append(QString::number(coordinates.longitude()));
+                  address = location.join(", ");
+              }
+
+              User buddy = User(address, coordinates, friendMap["name"].toString(),
+                               friendMap["note"].toString(), imageUrl,
+                               friendMap["timestamp"].toString(),
+                               false, friendMap["uid"].toString(), distanceMap["units"].toString(),
+                               distanceMap["value"].toDouble());
+
+              tmpFriendsList.append(buddy);
+            }
+
+            QList<QUrl> imageUrlList; // url list for images
+
+            // set unchanged profile images or add new images to imageUrlList for downloading
+            if(m_user) {
+                if(m_user->profileImageUrl() != user.profileImageUrl()) {
+                    if(!user.profileImageUrl().isEmpty())
+                        imageUrlList.append(user.profileImageUrl());
+                } else {
+                    user.setProfileImage(m_user->profileImage());
+                }
+            } else {
+                if(!user.profileImageUrl().isEmpty())
+                    imageUrlList.append(user.profileImageUrl());
+            }
+
+            // clear old user object
+            if(m_user) {
+                delete m_user;
+                m_user = 0;
+            }
+
+            // create new user object from temporary user object
+            m_user = new User(user);
+
+            // set unchanged profile images or add new images to imageUrlList for downloading
+            if(!m_friendsList.isEmpty()) {
+                foreach(User tmpBuddy, tmpFriendsList) {
+                    if(!tmpBuddy.profileImageUrl().isEmpty()) {
+                        bool found = false;
+                        foreach(User *buddy, m_friendsList) {
+                            if(tmpBuddy.profileImageUrl() == buddy->profileImageUrl()) {
+                                tmpBuddy.setProfileImage(buddy->profileImage());
+                                found = true;
+                                break;
+                            }
+                        }
+                        if(!found && !tmpBuddy.profileImageUrl().isEmpty())
+                            imageUrlList.append(tmpBuddy.profileImageUrl());
+                    }
+                }
+            } else {
+                foreach(User buddy, tmpFriendsList) {
+                    if(!buddy.profileImageUrl().isEmpty())
+                        imageUrlList.append(buddy.profileImageUrl());
+                }
+            }
+
+            // clear old friendlist
+            qDeleteAll(m_friendsList.begin(), m_friendsList.end());
+            m_friendsList.clear();
+
+            // populate new friendlist with temporary friendlist's data
+            foreach(User tmpFriendItem, tmpFriendsList) {
+                User *friendItem = new User(tmpFriendItem);
+                m_friendsList.append(friendItem);
+            }
+            tmpFriendsList.clear();
+
+            emit userDataChanged(m_user, m_friendsList);
+
+            // set silhouette image to imageUrlList for downloading
+            if(m_defaultImage)
+                imageUrlList.append(QUrl(SILHOUETTE_URL));
+
+            addProfileImages(imageUrlList);
+            imageUrlList.clear();
+        } else {
+            QVariant address = result.value("address");
+            if(!address.toString().isEmpty()) {
+                emit reverseGeoReady(address.toString());
+            } else {
+                QStringList coordinates;
+                coordinates.append(result.value("lat").toString());
+                coordinates.append(result.value("lon").toString());
+
+                emit error(ErrorContext::SITUARE, SituareError::ADDRESS_RETRIEVAL_FAILED);
+                emit reverseGeoReady(coordinates.join(", "));
+            }
+        }
+    }
 }
 
 void SituareService::requestFinished(QNetworkReply *reply)
@@ -245,40 +357,36 @@ void SituareService::requestFinished(QNetworkReply *reply)
     //Reply from situare
     if (m_currentRequests.contains(reply)) {
 
-        QUrl url = reply->url();
         qDebug() << "BytesAvailable: " << reply->bytesAvailable();
 
         if (reply->error()) {
-            emit error(reply->errorString());            
-            qDebug() << "TMP MESSAGE VILLE";
+            emit error(ErrorContext::NETWORK, reply->error());
         } else {
-            qint64 max = reply->size();
-            QByteArray replyArray = reply->read(max);
-            qDebug() << "Reply from: " << url << "reply " << replyArray;
+            QByteArray replyArray = reply->readAll();
+            qDebug() << "Reply from: " << reply->url() << "reply " << replyArray;
 
             if(replyArray == ERROR_LAT.toAscii()) {
                 qDebug() << "Error: " << ERROR_LAT;
-                emit error(UPDATE_FAILED);
+                emit error(ErrorContext::SITUARE, SituareError::UPDATE_FAILED);
             } else if(replyArray == ERROR_LON.toAscii()) {
                 qDebug() << "Error: " << ERROR_LON;
-                emit error(UPDATE_FAILED);
+                emit error(ErrorContext::SITUARE, SituareError::UPDATE_FAILED);
             } else if(replyArray.contains(ERROR_SESSION.toAscii())) {
                 qDebug() << "Error: " << ERROR_SESSION;
-                emit error(SESSION_EXPIRED);
+                emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED);
             } else if(replyArray.startsWith(OPENING_BRACE_MARK.toAscii())) {
                 qDebug() << "JSON string";
                 parseUserData(replyArray);
             } else if(replyArray.isEmpty()) {
-                if(url.toString().contains(UPDATE_LOCATION.toAscii())) {
+                if(reply->url().toString().contains(UPDATE_LOCATION.toAscii())) {
                     emit updateWasSuccessful();
                 } else {
                     // session credentials are invalid
-                    emit error(SESSION_EXPIRED);
+                    emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED);
                 }
             } else {
-                // Street address ready
-                QString address = QString::fromUtf8(replyArray);
-                emit reverseGeoReady(address);
+                // unknown reply
+                emit error(ErrorContext::SITUARE, SituareError::ERROR_GENERAL);
             }
         }
         m_currentRequests.removeAll(reply);
@@ -286,148 +394,50 @@ void SituareService::requestFinished(QNetworkReply *reply)
     }
 }
 
-void SituareService::credentialsReady(const FacebookCredentials &credentials)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_credentials = credentials;    
-}
-
-void SituareService::parseUserData(const QByteArray &jsonReply)
+void SituareService::reverseGeo(const GeoCoordinate &coordinates)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_visited = 0;
-    m_nbrOfImages = 0;
-    m_defaultImage = false;
-    qDeleteAll(m_friendsList.begin(), m_friendsList.end());
-    m_friendsList.clear();
-
-    if(m_user) {
-        delete m_user;
-        m_user = 0;
-    }
-
-    QJson::Parser parser;
-    bool ok;
-
-    QVariantMap result = parser.parse (jsonReply, &ok).toMap();
-    if (!ok) {
-
-        qFatal("An error occurred during parsing");
-        exit (1);
-    }
-
-    QVariant userVariant = result.value("user");
-    QMap<QString, QVariant> userMap = userVariant.toMap();
-
-    QPointF coordinates(userMap["longitude"].toReal(), userMap["latitude"].toReal());
-
-    QUrl imageUrl = userMap[NORMAL_SIZE_PROFILE_IMAGE].toUrl();
-
-    if(imageUrl.isEmpty()) {
-        // user doesn't have profile image, so we need to get him a silhouette image
-        m_defaultImage = true;
-    }
-
-    m_user = new User(userMap["address"].toString(), coordinates, userMap["name"].toString(),
-                  userMap["note"].toString(), imageUrl, userMap["timestamp"].toString(),
-                  true, userMap["uid"].toString());
-
-    foreach (QVariant friendsVariant, result["friends"].toList()) {
-      QMap<QString, QVariant> friendMap = friendsVariant.toMap();
-      QVariant distance = friendMap["distance"];
-      QMap<QString, QVariant> distanceMap = distance.toMap();
-
-      QPointF coordinates(friendMap["longitude"].toReal(), friendMap["latitude"].toReal());
-
-      QUrl imageUrl = friendMap["profile_pic"].toUrl();
-
-      if(imageUrl.isEmpty()) {
-          // friend doesn't have profile image, so we need to get him a silhouette image
-          m_defaultImage = true;
-      }
+    QHash<QString, QString> parameters;
+    parameters.insert("lat", degreesToString(coordinates.latitude()));
+    parameters.insert("lon", degreesToString(coordinates.longitude()));
+    parameters.insert("format", "json");
 
-      User *user = new User(friendMap["address"].toString(), coordinates,
-                            friendMap["name"].toString(),
-                            friendMap["note"].toString(), imageUrl,
-                            friendMap["timestamp"].toString(),
-                            false, friendMap["uid"].toString(),
-                            distanceMap["units"].toString(),
-                            distanceMap["value"].toDouble());
-
-      m_friendsList.append(user);
-    }
-    addProfileImages();
+    buildRequest(REVERSE_GEO, parameters);
 }
 
-void SituareService::imageReceived(const QUrl &url, const QPixmap &image)
+void SituareService::sendRequest(const QString &requestUrl)
 {
-    qDebug() << __PRETTY_FUNCTION__;
-    qDebug() << "Image URL: " << url << " size :" << image.size();
-
-    // assign facebook silhouette image to all who doesn't have a profile image
-    if(url == QUrl(SILHOUETTE_URL)) {
-        if(m_user->profileImageUrl().isEmpty()) {
-            m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large));
-        }
-        for(int i=0;i < m_friendsList.count();i++) {
-            if(m_friendsList.at(i)->profileImageUrl().isEmpty()) {
-                m_friendsList.at(i)->setProfileImage(AvatarImage::create(image,
-                                                                         AvatarImage::Small));
-            }
-        }
-    }
-
-    if (m_user->profileImageUrl() == url) {
-        m_user->setProfileImage(AvatarImage::create(image, AvatarImage::Large));
-    }
-
-    for(int i=0;i<m_friendsList.count();i++) {
-        if(m_friendsList.at(i)->profileImageUrl() == url) {
-            m_friendsList.at(i)->setProfileImage(AvatarImage::create(image, AvatarImage::Small));
-            m_nbrOfImages++; // indicates how many friend profile images has been downloaded
-        }
-    }
+    qDebug() << __PRETTY_FUNCTION__ << "requestUrl" << requestUrl;
 
-    if(m_nbrOfImages == m_visited) {
-        qDebug() << "m_nbrOfImages: " << m_nbrOfImages << " m_visited: " << m_visited;
-        qDebug() << "emit userDataChanged";
-        emit userDataChanged(m_user, m_friendsList);
-    }
+    // make and send the request
+    QNetworkRequest request;
+    request.setUrl(QUrl(requestUrl));
+    request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
+    QNetworkReply *reply = m_networkManager->get(request, true);
+    m_currentRequests.append(reply);
 }
 
-void SituareService::addProfileImages()
+void SituareService::updateSession(const QString &session)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    // reduce net traffic by sending only one download request for facebook silhouette image
-    if(m_defaultImage) {
-        emit fetchImage(QUrl(SILHOUETTE_URL));
-    }
-
-    if(!m_user->profileImageUrl().isEmpty() && m_user->profileImageUrl().isValid())
-        emit fetchImage(m_user->profileImageUrl());
+    m_session = session;
 
-    for(int i=0;i<m_friendsList.count();i++) {
-        if(!m_friendsList.at(i)->profileImageUrl().isEmpty() &&
-           m_friendsList.at(i)->profileImageUrl().isValid()) {
-            m_visited++; // indicates how many friends that have profile image
-            emit fetchImage(m_friendsList.at(i)->profileImageUrl());
-        }
-    }
+    if (m_session.isEmpty())
+        clearUserData();
 }
 
-void SituareService::clearUserData()
+void SituareService::updateLocation(const GeoCoordinate &coordinates, const QString &status,
+                                    const bool &publish)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    qDeleteAll(m_friendsList.begin(), m_friendsList.end());
-    m_friendsList.clear();
+    QHash<QString, QString> parameters;
+    parameters.insert("lat", degreesToString(coordinates.latitude()));
+    parameters.insert("lon", degreesToString(coordinates.longitude()));
+    parameters.insert("publish", publish ? "true" : "false");
+    parameters.insert("data", status); ///< @todo if !empty ???
 
-    if(m_user) {
-        delete m_user;
-        m_user = 0;
-    }
-    emit userDataChanged(m_user, m_friendsList);
+    buildRequest(UPDATE_LOCATION, parameters);
 }