From ab1a80f162d3f1c3d492c80edff6c3212ee3dc30 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sami=20R=C3=A4m=C3=B6?= Date: Mon, 8 Nov 2010 15:08:58 +0200 Subject: [PATCH] Removing some old code, disabled the api=2.0 parameter --- src/engine/engine.cpp | 19 +-- src/facebookservice/facebookauthentication.cpp | 2 +- src/situareservice/situareservice.cpp | 6 +- src/ui/mainwindow.cpp | 190 +----------------------- src/ui/mainwindow.h | 45 ------ 5 files changed, 11 insertions(+), 251 deletions(-) diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 48fa6cd..3397985 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -383,6 +383,7 @@ void SituareEngine::loginActionPressed() void SituareEngine::loginOk() { + /// @ OLD CODE, REFACTOR! loggedIn -> FB authenticator etc. qDebug() << __PRETTY_FUNCTION__; m_ui->loggedIn(true); @@ -594,21 +595,6 @@ void SituareEngine::signalsFromFacebookAuthenticator() connect(m_facebookAuthenticator, SIGNAL(error(int, int)), this, SLOT(error(int, int))); - connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)), - m_situareService, SLOT(credentialsReady(FacebookCredentials))); - - connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)), - this, SLOT(loginOk())); - - connect(m_facebookAuthenticator, SIGNAL(newLoginRequest()), - m_ui, SLOT(startLoginProcess())); - - connect(m_facebookAuthenticator, SIGNAL(saveCookiesRequest()), - m_ui, SLOT(saveCookies())); - - connect(m_facebookAuthenticator, SIGNAL(loginUsingCookies()), - m_ui, SLOT(loginUsingCookies())); - connect(m_facebookAuthenticator, SIGNAL(buildLoginBrowser()), m_ui, SLOT(buildFacebookLoginBrowser())); @@ -654,9 +640,6 @@ void SituareEngine::signalsFromMainWindow() connect(m_ui, SIGNAL(loginActionPressed()), this, SLOT(loginActionPressed())); - connect(m_ui, SIGNAL(updateCredentials(QUrl)), - m_facebookAuthenticator, SLOT(updateCredentials(QUrl))); - connect(m_ui, SIGNAL(loginBrowserCreated(FacebookLoginBrowser*)), m_facebookAuthenticator, SLOT(setBrowser(FacebookLoginBrowser*))); diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp index 4c2d804..6123305 100644 --- a/src/facebookservice/facebookauthentication.cpp +++ b/src/facebookservice/facebookauthentication.cpp @@ -129,7 +129,7 @@ void FacebookAuthentication::setBrowser(FacebookLoginBrowser *browser) QString url = "https://www.facebook.com/login.php?"; url.append("api_key=cf77865a5070f2c2ba3b52cbf3371579&"); ///< @todo hard coded test server api key url.append("cancel_url=http://www.facebook.com/connect/login_failure.html&"); - url.append("display=popup&"); + url.append("display=touch&"); url.append("fbconnect=1&"); url.append("next=http://www.facebook.com/connect/login_success.html&"); url.append("return_session=1&"); diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp index 87847c4..538d432 100644 --- a/src/situareservice/situareservice.cpp +++ b/src/situareservice/situareservice.cpp @@ -98,8 +98,8 @@ void SituareService::buildRequest(const QString &script, const QHashpage()->networkAccessManager()->setCookieJar(m_cookieJar); - - connect(m_webView->page()->networkAccessManager(), SIGNAL(finished(QNetworkReply*)), - this, SLOT(webViewRequestFinished(QNetworkReply*))); - connect(m_webView, SIGNAL(urlChanged(const QUrl &)), - this, SIGNAL(updateCredentials(QUrl))); - connect(m_webView, SIGNAL(loadFinished(bool)), - this, SLOT(loadDone(bool))); - - connect(m_webView->page()->networkAccessManager(), - SIGNAL(sslErrors(QNetworkReply*,QList)), - this, SLOT(sslErrors(QNetworkReply*,QList))); - - m_webView->hide(); - } -} - void MainWindow::buildZoomButtonPanel() { qDebug() << __PRETTY_FUNCTION__; @@ -529,24 +497,6 @@ void MainWindow::buildZoomButtonPanel() this, SIGNAL(draggingModeTriggered())); } -void MainWindow::clearCookieJar() -{ - qDebug() << __PRETTY_FUNCTION__; - - buildWebView(); - - m_webView->stop(); - - if(!m_cookieJar) { - m_cookieJar = new NetworkCookieJar(new QNetworkCookieJar(this)); - } - QList emptyList; - emptyList.clear(); - -// m_cookieJar->setAllCookies(emptyList); - m_webView->page()->networkAccessManager()->setCookieJar(m_cookieJar); -} - void MainWindow::createMenus() { qDebug() << __PRETTY_FUNCTION__; @@ -591,35 +541,9 @@ void MainWindow::dialogFinished(int status) qDebug() << __PRETTY_FUNCTION__; QDialog *dialog = m_queue.takeFirst(); - LoginDialog *loginDialog = qobject_cast(dialog); SearchDialog *searchDialog = qobject_cast(dialog); - if(loginDialog) { - /// @todo Remove login related code - if(status != 0) { - buildWebView(); - loginDialog->userInput(m_email, m_password); - - QStringList urlParts; - urlParts.append(FACEBOOK_LOGINBASE); - urlParts.append(API_KEY_PARAMETER_NAME); - urlParts.append(API_KEY); - urlParts.append(INTERVAL1); - urlParts.append(SITUARE_LOGIN_SUCCESS); - urlParts.append(INTERVAL2); - urlParts.append(SITUARE_LOGIN_FAILURE); - urlParts.append(FACEBOOK_LOGIN_ENDING); - - m_refresh = true; - m_webView->load(QUrl(urlParts.join(EMPTY))); - toggleProgressIndicator(true); - } else { - emit cancelLoginProcess(); - } - } else if(searchDialog) { - if(status != 0) { - emit searchForLocation(searchDialog->input()); - } - } + if ((searchDialog) && (status != 0)) + emit searchForLocation(searchDialog->input()); dialog->deleteLater(); @@ -730,75 +654,9 @@ void MainWindow::keyPressEvent(QKeyEvent* event) QWidget::keyPressEvent(event); } -///< @todo remove old, duplicate loadCookies() -void MainWindow::loadCookies() -{ - qDebug() << __PRETTY_FUNCTION__; - -// QSettings settings(DIRECTORY_NAME, FILE_NAME); - -// QStringList list = settings.value(COOKIES, EMPTY).toStringList(); - -// if(!list.isEmpty()) { -// QList cookieList; -// for(int i=0;isetAllCookies(cookieList); -// m_webView->page()->networkAccessManager()->setCookieJar(m_cookieJar); -// } -} - -void MainWindow::loadDone(bool done) -{ - qDebug() << __PRETTY_FUNCTION__; - - // for the first time the login page is opened, we need to refresh it to get cookies working - if(m_refresh) { - m_webView->reload(); - m_refresh = false; - } - - if (done) - { - QWebFrame* frame = m_webView->page()->currentFrame(); - if (frame!=NULL) - { - // set email box - QWebElementCollection emailCollection = frame->findAllElements("input[name=email]"); - - foreach (QWebElement element, emailCollection) { - element.setAttribute("value", m_email.toAscii()); - } - // set password box - QWebElementCollection passwordCollection = frame->findAllElements("input[name=pass]"); - foreach (QWebElement element, passwordCollection) { - element.setAttribute("value", m_password.toAscii()); - } - // find connect button - QWebElementCollection buttonCollection = frame->findAllElements("input[name=login]"); - foreach (QWebElement element, buttonCollection) - { - QPoint pos(element.geometry().center()); - - // send a mouse click event to the web page - QMouseEvent event0(QEvent::MouseButtonPress, pos, Qt::LeftButton, Qt::LeftButton, - Qt::NoModifier); - QApplication::sendEvent(m_webView->page(), &event0); - QMouseEvent event1(QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton, - Qt::NoModifier); - QApplication::sendEvent(m_webView->page(), &event1); - } - } - } -} - void MainWindow::loggedIn(bool logged) { + /// @todo OLD CODE qDebug() << __PRETTY_FUNCTION__; m_loggedIn = logged; @@ -806,7 +664,7 @@ void MainWindow::loggedIn(bool logged) if(logged) { m_loginAct->setText(tr("Logout")); } else { - clearCookieJar(); +// clearCookieJar(); m_email.clear(); m_password.clear(); @@ -818,9 +676,10 @@ void MainWindow::loggedIn(bool logged) void MainWindow::loginFailed() { + /// @todo OLD CODE qDebug() << __PRETTY_FUNCTION__; - clearCookieJar(); +// clearCookieJar(); startLoginProcess(); } @@ -831,29 +690,6 @@ bool MainWindow::loginState() return m_loggedIn; } -void MainWindow::loginUsingCookies() -{ - qDebug() << __PRETTY_FUNCTION__; - - toggleProgressIndicator(true); - - buildWebView(); - loadCookies(); - - QStringList urlParts; - urlParts.append(FACEBOOK_LOGINBASE); - urlParts.append(API_KEY_PARAMETER_NAME); - urlParts.append(API_KEY); - urlParts.append(INTERVAL1); - urlParts.append(SITUARE_LOGIN_SUCCESS); - urlParts.append(INTERVAL2); - urlParts.append(SITUARE_LOGIN_FAILURE); - urlParts.append(FACEBOOK_LOGIN_ENDING); - - m_webView->load(QUrl(urlParts.join(EMPTY))); - -} - void MainWindow::mapCenterHorizontalShiftingChanged(int shifting) { m_mapCenterHorizontalShifting = shifting; @@ -1106,15 +942,3 @@ const QString MainWindow::username() return m_email; } - -void MainWindow::webViewRequestFinished(QNetworkReply *reply) -{ - qDebug() << __PRETTY_FUNCTION__; - - // omit QNetworkReply::OperationCanceledError due to it's nature to be called when ever - // qwebview starts to load a new page while the current page loading is not finished - if(reply->error() != QNetworkReply::OperationCanceledError && - reply->error() != QNetworkReply::NoError) { - emit error(ErrorContext::NETWORK, reply->error()); - } -} diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 95e58e3..0c2f464 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -95,12 +95,6 @@ private: ******************************************************************************/ public: /** - * @brief Clears cookie jar - * - */ - void clearCookieJar(); - - /** * @brief * * @param logged @@ -175,11 +169,6 @@ public slots: void loginFailed(); /** - * @brief Slot to intercept signal when login with cookies is requested - */ - void loginUsingCookies(); - - /** * @brief Public slot, which open settings dialog */ void openSettingsDialog(); @@ -276,11 +265,6 @@ private: void buildUserInfoPanel(); /** - * @brief Build webview and connect slots - */ - void buildWebView(); - - /** * @brief Build zoom button panel and connect slots */ void buildZoomButtonPanel(); @@ -368,18 +352,6 @@ private slots: void gpsTimeout(); /** - * @brief Slot to load cookies from settings - */ - void loadCookies(); - - /** - * @brief Slot to intercept signal when webview has finished loading webpage - * - * @param done Status of the loading - */ - void loadDone(bool done); - - /** * @brief Called when map center point horizontal shifting is changed * * @param shifting New shifting value @@ -416,13 +388,6 @@ private slots: */ void toggleFullScreen(); - /** - * @brief Slot to intercept signal from webview's networkaccessmanager - * - * @param reply Network reply (contains errors) - */ - void webViewRequestFinished(QNetworkReply* reply); - /******************************************************************************* * SIGNALS ******************************************************************************/ @@ -639,13 +604,6 @@ signals: void statusUpdate(const QString &status, const bool &publish); /** - * @brief Signals when webview's urlChanged signal is emitted - * - * @param url New url - */ - void updateCredentials(const QUrl &url); - - /** * @brief Signals when updateLocationDialog's data must be cleared * */ @@ -712,8 +670,6 @@ private: QString m_email; ///< Placeholder for email QString m_password; ///< Placeholder for password - QWebView *m_webView; ///< Shows facebook login page - FacebookLoginBrowser *m_facebookLoginBrowser; FriendListPanel *m_friendsListPanel; ///< Instance of friends list panel FullScreenButton *m_fullScreenButton; ///< Instance of the fullscreen toggle button @@ -721,7 +677,6 @@ private: LocationSearchPanel *m_locationSearchPanel; ///< Location search panel MapScale *m_mapScale; ///< Instance of the map scale MapView *m_mapView; ///< Instance of the map view - NetworkCookieJar *m_cookieJar; ///< Placeholder for QNetworkCookies RoutingPanel *m_routingPanel; ///< Instance of routing panel TabbedPanel *m_tabbedPanel; ///< Widget for tabbed panels UserInfoPanel *m_userInfoPanel; ///< Instance of the user information panel -- 1.7.9.5