Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 14760ae..3bbcc2d 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -29,17 +29,25 @@ SituareEngine::SituareEngine(QMainWindow *parent)
     m_ui = new MainWindow;
 
     m_networkManager = new QNetworkAccessManager;
-    m_situareService = new SituareService(this,m_networkManager);
+    m_situareService = new SituareService(this, m_networkManager);
 
     m_loggedIn = false;
     m_facebookAuthenticator = new FacebookAuthentication();
 
-    connect(m_facebookAuthenticator, SIGNAL(credentialsReady()), this, SLOT(loginOk()));
-    connect(m_facebookAuthenticator, SIGNAL(userExit()), this, SLOT(loginScreenClosed()));
+    connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)),
+            m_situareService, SLOT(credentialsReady(FacebookCredentials)));
+    connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)),
+            this, SLOT(loginOk()));
 
     connect(m_ui, SIGNAL(requestReverseGeo()), this, SLOT(requestAddress()));
     connect(m_situareService, SIGNAL(reverseGeoReady(QString)), m_ui, SIGNAL(reverseGeoReady(QString)));
     connect(m_ui, SIGNAL(statusUpdate(QString,bool)), this, SLOT(requestUpdateLocation(QString,bool)));
+    connect(m_situareService, SIGNAL(error(QString)), this, SLOT(error(QString)));
+
+    connect(m_situareService, SIGNAL(userDataChanged(User*,QList<User*>&)), m_ui,
+            SIGNAL(userDataChanged(User*,QList<User*>&)));
+
+    connect(m_ui, SIGNAL(refreshUserData()), this, SLOT(refreshUserData()));
 
     start();
 }
@@ -48,26 +56,37 @@ SituareEngine::~SituareEngine()
 {
     qDebug() << __PRETTY_FUNCTION__;
     delete m_ui;
+    delete m_facebookAuthenticator;
+}
+
+void SituareEngine::error(const QString &error)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    qDebug() << error;
+    // ToDo: signal UI?
 }
 
 void SituareEngine::start()
 {
+    qDebug() << __PRETTY_FUNCTION__;
+
     m_facebookAuthenticator->start();
 }
 
-
 void SituareEngine::loginOk()
-
 {
     qDebug() << __PRETTY_FUNCTION__;
+
     m_loggedIn = true;
     m_facebookAuthenticator->hide();
     m_ui->show();
+    m_situareService->fetchLocations(); // request user locations
 }
 
 void SituareEngine::requestAddress()
 {
     qDebug() << __PRETTY_FUNCTION__;
+
     QPointF coordinates(65, 25.5); // this will be get from somewhere, map etc...
     m_situareService->reverseGeo(coordinates);
 }
@@ -75,12 +94,14 @@ void SituareEngine::requestAddress()
 void SituareEngine::requestUpdateLocation(const QString &status, const bool &publish)
 {
     qDebug() << __PRETTY_FUNCTION__;
+
     QPointF coordinates(65, 25.5); // this will be get from somewhere, map etc...
     m_situareService->updateLocation(coordinates, status, publish);
 }
 
-void SituareEngine::updateFriendsList()
+void SituareEngine::refreshUserData()
 {
     qDebug() << __PRETTY_FUNCTION__;
-    //code here
+
+    m_situareService->fetchLocations();
 }