Few clean-ups

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 7319abf..54d794a 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -197,6 +197,7 @@ void SituareEngine::invalidCredentials()
     m_facebookAuthenticator->clearAccountInformation(true); // keep username = true
     m_ui->clearCookieJar();
     m_ui->showMaemoInformationBox(tr("Session expired. Please login again"), true);
+    m_ui->loggedIn(false);
     m_facebookAuthenticator->start();
 }
 

diff --git a/src/network/networkcookiejar.cpp b/src/network/networkcookiejar.cpp
index 6cdce85..da28e2f 100644 (file)
--- a/src/network/networkcookiejar.cpp
+++ b/src/network/networkcookiejar.cpp
@@ -45,7 +45,6 @@ bool NetworkCookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList
     QList<QNetworkCookie> cookies = allCookies();
     foreach(QNetworkCookie cookie, cookieList) {
         cookies += cookie;
-        //qDebug() << cookie.toRawForm(QNetworkCookie::Full);
     }
     setAllCookies(cookies);
 

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index de42553..b09f7d3 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -240,7 +240,10 @@ void MainWindow::buildWebView()
     if(!m_webView) {
         m_webView = new QWebView;
 
-        connectWebViewSignals(true);
+        connect(m_webView, SIGNAL(urlChanged(const QUrl &)),
+                this, SIGNAL(updateCredentials(QUrl)));
+        connect(m_webView, SIGNAL(loadFinished(bool)),
+                this, SLOT(loadDone(bool)));
 
         m_webView->hide();
     }
@@ -287,24 +290,6 @@ void MainWindow::clearCookieJar()
     m_webView->page()->networkAccessManager()->setCookieJar(m_cookieJar);
 }
 
-void MainWindow::connectWebViewSignals(bool connectSignals)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    if(connectSignals) {
-        connect(m_webView, SIGNAL(urlChanged(const QUrl &)),
-                this, SIGNAL(updateCredentials(QUrl)));
-        connect(m_webView, SIGNAL(loadFinished(bool)),
-                this, SLOT(loadDone(bool)));
-    }
-    else {
-        disconnect(m_webView, SIGNAL(loadFinished(bool)),
-                   this, SLOT(loadDone(bool)));
-        disconnect(m_webView, SIGNAL(urlChanged(const QUrl &)),
-                   this, SLOT(updateCredentials(const QUrl &)));
-    }
-}
-
 void MainWindow::createMenus()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -429,16 +414,15 @@ void MainWindow::loadCookies()
     QString cookies = settings.value(COOKIES, EMPTY).toString();
     if(!cookies.isEmpty()) {
         QStringList list = cookies.split("|");
+        list.removeDuplicates();
         QList<QNetworkCookie> cookieList;
 
         for(int i=0;i<list.count();i++) {
             QNetworkCookie tmpCookie;
-            QList<QNetworkCookie> parserList = tmpCookie.parseCookies(list.at(i).toAscii());
-            cookieList.append(parserList.at(0));
+            cookieList.append(tmpCookie.parseCookies(list.at(i).toAscii()));
         }
-        if(!m_cookieJar) {
+        if(!m_cookieJar)
             m_cookieJar = new NetworkCookieJar(new QNetworkCookieJar(this));
-        }
 
         m_cookieJar->setAllCookies(cookieList);
         m_webView->page()->networkAccessManager()->setCookieJar(m_cookieJar);
@@ -587,8 +571,9 @@ void MainWindow::saveCookies()
         QByteArray byteArray = cookie.toRawForm(QNetworkCookie::Full);
         list.append(QString(byteArray));
     }
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    list.removeDuplicates();
 
+    QSettings settings(DIRECTORY_NAME, FILE_NAME);
     settings.setValue(COOKIES, list.join("|"));
 }
 
@@ -702,16 +687,11 @@ void MainWindow::startLoginProcess(const QUrl &url)
 
     if(m_loginDialog->exec() != QDialog::Accepted) {
         // if login dialog was canceled we need to stop processing webview
-        // stop and disconnect m_webView;
         m_webView->stop();
-        connectWebViewSignals(false);
 
         emit cancelLoginProcess();
     }
     else {
-        // connect webview signals again since they might have been disconnected
-        connectWebViewSignals(true);
-
         m_webView->load(url);
         toggleProgressIndicator(true);
         m_refresh = true;

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index c644e8a..9e37b6a 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -228,13 +228,6 @@ private:
     void buildZoomButtonPanel();
 
     /**
-    * @brief connect/disconnect webview signals
-    *
-    * @param connectSignals true = connect, false = disconnect
-    */
-    void connectWebViewSignals(bool connectSignals);
-
-    /**
     * @brief Private method to create the Menu items
     */
     void createMenus();