third draft

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 94b541d..420c591 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -45,6 +45,45 @@ FacebookAuthentication::FacebookAuthentication(QObject *parent)
 
 }
 
+void FacebookAuthentication::clearAccountInformation()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_loginCredentials.clearCredentials();
+    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    settings.remove(USERNAME);
+    settings.remove(COOKIES);
+}
+
+QUrl FacebookAuthentication::formLoginPageUrl(const QStringList &urlParts) const
+{
+   qDebug() << __PRETTY_FUNCTION__;
+
+   return QUrl(urlParts.join(EMPTY));
+}
+
+const QString FacebookAuthentication::loadUsername()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    return settings.value(USERNAME, EMPTY).toString();
+}
+
+FacebookCredentials FacebookAuthentication::loginCredentials() const
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    return m_loginCredentials;
+}
+
+void FacebookAuthentication::saveUsername(const QString &username)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    settings.setValue(USERNAME, username);
+}
+
 void FacebookAuthentication::start()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -138,6 +177,7 @@ bool FacebookAuthentication::updateCredentials(const QUrl &url)
                error page (loadingDone() signal is emitted) and we need to avoid that because
                at this point we don't have new login parameters */
             if(m_loginAttempts % 2) {
+                clearAccountInformation();
                 emit loginFailure();
             }
         }
@@ -158,42 +198,3 @@ bool FacebookAuthentication::updateCredentials(const QUrl &url)
     }
     return found;
 }
-
- FacebookCredentials FacebookAuthentication::loginCredentials() const
- {
-     qDebug() << __PRETTY_FUNCTION__;
-     return m_loginCredentials;
- }
-
- QUrl FacebookAuthentication::formLoginPageUrl(const QStringList &urlParts) const
- {
-    qDebug() << __PRETTY_FUNCTION__;
-
-    return QUrl(urlParts.join(EMPTY));
- }
-
- void FacebookAuthentication::saveUsername(const QString &username)
- {
-     qDebug() << __PRETTY_FUNCTION__;
-
-     QSettings settings(DIRECTORY_NAME, FILE_NAME);
-     settings.setValue(USERNAME, username);
- }
-
- const QString FacebookAuthentication::loadUsername()
- {
-     qDebug() << __PRETTY_FUNCTION__;
-
-     QSettings settings(DIRECTORY_NAME, FILE_NAME);
-     return settings.value(USERNAME, EMPTY).toString();
- }
-
- void FacebookAuthentication::clearAccountInformation()
- {
-     qDebug() << __PRETTY_FUNCTION__;
-
-     m_loginCredentials.clearCredentials();
-     QSettings settings(DIRECTORY_NAME, FILE_NAME);
-     settings.remove(USERNAME);
-     settings.remove(COOKIES);
- }

diff --git a/src/facebookservice/facebookauthentication.h b/src/facebookservice/facebookauthentication.h
index 5d99918..8648ee5 100644 (file)
--- a/src/facebookservice/facebookauthentication.h
+++ b/src/facebookservice/facebookauthentication.h
@@ -62,6 +62,12 @@ public:
 public slots:
 
     /**
+    * @brief Clears account iformation from settings
+    *
+    */
+    void clearAccountInformation();
+
+    /**
     * @brief Loads username from settings
     *
     * @return QString Loaded username
@@ -82,12 +88,6 @@ public slots:
     */
     void start();
 
-    /**
-    * @brief Clears account iformation from settings
-    *
-    */
-    void clearAccountInformation();
-
 private: 
 
     /**

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 9bda5bf..b57c3ac 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -508,6 +508,9 @@ void MainWindow::loggedIn(bool logged)
         m_email.clear();
         m_password.clear();
 
+        if(m_loginDialog)
+            m_loginDialog->clearTextFields();
+
         m_loginAct->setText(tr("Login"));
     }
     showPanels(m_loggedIn);