From 6929a95d4efa92233e108ca7ffb2dd75ba3f2e70 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sami=20R=C3=A4m=C3=B6?= <sami.ramo@ixonos.com>
Date: Wed, 10 Nov 2010 12:57:16 +0200
Subject: [PATCH] Emit error instead of queuing requests when session is empty

---
 src/situareservice/situareservice.cpp |   17 ++++-------------
 src/situareservice/situareservice.h   |    5 ++---
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 5ed52fd..f632495 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
@@ -28,7 +29,7 @@
 #include <QtAlgorithms>
 #include <QtGlobal>
 
-#include "error.h"
+#include "../error.h"
 #include "network/networkaccessmanager.h"
 #include "situarecommon.h"
 #include "ui/avatarimage.h"
@@ -116,8 +117,7 @@ void SituareService::buildRequest(const QString &script, const QHash<QString, QS
         appendAccessToken(url);
         sendRequest(url);
     } else {
-        m_requestsWaitingAccessToken.append(url);
-        ///< @todo emit login request
+        emit error(ErrorContext::SITUARE, SituareError::SESSION_EXPIRED);
     }
 }
 
@@ -422,17 +422,8 @@ void SituareService::updateSession(const QString &session)
 
     m_session = session;
 
-    if (!m_session.isEmpty()) {
-        foreach (QString request, m_requestsWaitingAccessToken) {
-            appendAccessToken(request);
-            sendRequest(request);
-        }
-    }
-    else {
+    if (m_session.isEmpty())
         clearUserData();
-    }
-
-    m_requestsWaitingAccessToken.clear();
 }
 
 void SituareService::updateLocation(const GeoCoordinate &coordinates, const QString &status,
diff --git a/src/situareservice/situareservice.h b/src/situareservice/situareservice.h
index f57bfa0..1f8a171 100644
--- a/src/situareservice/situareservice.h
+++ b/src/situareservice/situareservice.h
@@ -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
@@ -38,7 +39,7 @@ class QUrl;
 * @brief SituareService class for communicating with Situare server
 *
 * @author Henri Lampela
-* @class SituareService situareservice.h "situareservice/situareservice.h"
+* @author Sami Rämö - sami.ramo (at) ixonos.com
 */
 class SituareService : public QObject
 {
@@ -220,11 +221,9 @@ signals:
  ******************************************************************************/
 
 private:
-
     bool m_defaultImage;    ///< Indicates if some of the friends/user doesn't have a image
 
     QList<QNetworkReply *> m_currentRequests;       ///< List of current http requests
-    QList<QString> m_requestsWaitingAccessToken;    ///< Requests waiting for access_token
     QList<User *> m_friendsList;                    ///< List of friends(User)
 
     QString m_session;                          ///< Session data
-- 
1.7.9.5