Moving login related stuff from Engine to FacebookAuthentication

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 9e21ea7..a58716a 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -29,7 +29,9 @@
 
 #include "application.h"
 #include "common.h"
+#include "contactmanager.h"
 #include "../error.h"
+#include "ui/facebookloginbrowser.h"
 #include "facebookservice/facebookauthentication.h"
 #include "gps/gpsposition.h"
 #include "map/mapengine.h"
@@ -125,13 +127,16 @@ SituareEngine::SituareEngine()
     m_mapEngine->init();
     m_ui->show();
 
-    m_facebookAuthenticator->start();
-
     m_gps->setMode(GPSPosition::Default);
     initializeGpsAndAutocentering();
 
     m_mce = new MCE(this);
     connect(m_mce, SIGNAL(displayOff(bool)), this, SLOT(setPowerSaving(bool)));
+
+    m_contactManager = new ContactManager(this);
+    m_contactManager->requestContactGuids();
+
+    m_facebookAuthenticator->login();
 }
 
 SituareEngine::~SituareEngine()
@@ -300,13 +305,6 @@ void SituareEngine::error(const int context, const int error)
     }
 }
 
-void SituareEngine::fetchUsernameFromSettings()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_ui->setUsername(m_facebookAuthenticator->loadUsername());
-}
-
 void SituareEngine::imageReady(User *user)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -357,6 +355,15 @@ void SituareEngine::locationSearch(QString location)
         m_geocodingService->requestLocation(location);
 }
 
+void SituareEngine::loggedIn()
+{
+    qWarning() << __PRETTY_FUNCTION__;
+
+    m_ui->destroyFacebookLoginBrowser();
+
+    loginOk();
+}
+
 void SituareEngine::loginActionPressed()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -366,7 +373,7 @@ void SituareEngine::loginActionPressed()
             logout();
             m_situareService->clearUserData();
         } else {
-            m_facebookAuthenticator->start();
+            m_facebookAuthenticator->login();
         }
     }
     else {
@@ -567,6 +574,19 @@ void SituareEngine::setPowerSaving(bool enabled)
         m_mapEngine->setAutoCentering(!enabled);
 }
 
+void SituareEngine::showContactDialog(const QString &facebookId)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QString guid = m_contactManager->contactGuid(facebookId);
+
+    if (!guid.isEmpty())
+        m_ui->showContactDialog(guid);
+    else
+        m_ui->buildInformationBox(tr("Unable to find contact.\nAdd Facebook IM "
+                                     "account from Conversations to use this feature."), true);
+}
+
 void SituareEngine::signalsFromFacebookAuthenticator()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -588,6 +608,15 @@ void SituareEngine::signalsFromFacebookAuthenticator()
 
     connect(m_facebookAuthenticator, SIGNAL(loginUsingCookies()),
             m_ui, SLOT(loginUsingCookies()));
+
+    connect(m_facebookAuthenticator, SIGNAL(buildLoginBrowser()),
+            m_ui, SLOT(buildFacebookLoginBrowser()));
+
+    connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString)),
+            m_situareService, SLOT(updateSession(QString)));
+
+    connect(m_facebookAuthenticator, SIGNAL(loggedIn(QString)),
+            this, SLOT(loggedIn()));
 }
 
 void SituareEngine::signalsFromGeocodingService()
@@ -634,6 +663,9 @@ void SituareEngine::signalsFromMainWindow()
     connect(m_ui, SIGNAL(updateCredentials(QUrl)),
             m_facebookAuthenticator, SLOT(updateCredentials(QUrl)));
 
+    connect(m_ui, SIGNAL(loginBrowserCreated(FacebookLoginBrowser*)),
+            m_facebookAuthenticator, SLOT(setBrowser(FacebookLoginBrowser*)));
+
     // signals from map view
     connect(m_ui, SIGNAL(mapViewScrolled(SceneCoordinate)),
             m_mapEngine, SLOT(setCenterPosition(SceneCoordinate)));
@@ -685,6 +717,9 @@ void SituareEngine::signalsFromMainWindow()
             m_mapEngine,
             SLOT(showMapArea(const GeoCoordinate&, const GeoCoordinate&)));
 
+    connect(m_ui, SIGNAL(searchHistoryItemClicked(QString)),
+            this, SLOT(locationSearch(QString)));
+
     // signals from routing tab
     connect(m_ui, SIGNAL(clearRoute()),
             m_mapEngine, SLOT(clearRoute()));
@@ -702,6 +737,10 @@ void SituareEngine::signalsFromMainWindow()
     // signal from search location dialog
     connect(m_ui, SIGNAL(searchForLocation(QString)),
             this, SLOT(locationSearch(QString)));
+
+    // signal from friend list panel
+    connect(m_ui, SIGNAL(requestContactDialog(const QString &)),
+            this, SLOT(showContactDialog(const QString &)));
 }
 
 void SituareEngine::signalsFromMapEngine()
@@ -806,7 +845,6 @@ void SituareEngine::userDataChanged(User *user, QList<User *> &friendsList)
     qDebug() << __PRETTY_FUNCTION__;
 
     m_ui->toggleProgressIndicator(false);
-    m_ui->showPanels();
 
     emit userLocationReady(user);
     emit friendsLocationsReady(friendsList);