Implemented NetworkCookieJar::clearCookiesSetting()

 - clean-up
 - adding documentation for NetworkCookieJar

diff --git a/src/common.h b/src/common.h
index 8733932..9c27d2b 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -27,12 +27,10 @@
 #include <QFont>
 
 // QSettings identifiers
-const QString DIRECTORY_NAME = "Ixonos";
-const QString FILE_NAME = "Situare";
+const QString SETTINGS_ORGANIZATION_NAME = "Ixonos";
+const QString SETTINGS_APPLICATION_NAME = "Situare";
 
 // QSettings common values
-const QString COOKIES = "cookies";
-const QString EMPTY = "";
 const QString SETTINGS_AUTOMATIC_UPDATE_ENABLED = "SETTINGS_AUTOMATIC_UPDATE_ENABLED";
 const QString SETTINGS_AUTOMATIC_UPDATE_INTERVAL = "SETTINGS_AUTOMATIC_UPDATE_INTERVAL";
 const QString USER_UNSEND_MESSAGE = "UNSEND_MESSAGE_CONTENT";
@@ -47,14 +45,4 @@ const QColor COLOR_GRAY = QColor(152, 152, 152);                        ///< Gra
 const QFont NOKIA_FONT_NORMAL = QFont("Nokia Sans", 18, QFont::Normal); ///< Normal font
 const QFont NOKIA_FONT_SMALL = QFont("Nokia Sans", 13, QFont::Normal);  ///< Small font
 
-///< @todo remove / change old fb login url stuff
-// Facebook login page pieces
-const QString FACEBOOK_LOGINBASE = "http://www.facebook.com/login.php?";
-const QString API_KEY_PARAMETER_NAME = "api_key=";
-const QString INTERVAL1 = "&connect_display=popup&v=1.0&next=";
-const QString SITUARE_LOGIN_SUCCESS = "http://www.facebook.com/connect/login_success.html";
-const QString INTERVAL2 = "&cancel_url=";
-const QString SITUARE_LOGIN_FAILURE = "http://www.facebook.com/connect/login_failure.html";
-const QString FACEBOOK_LOGIN_ENDING = "&fbconnect=true&return_session=true&";
-
 #endif // COMMON_H

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 3397985..6edd87e 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -145,7 +145,7 @@ SituareEngine::~SituareEngine()
 
     delete m_ui;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     settings.setValue(SETTINGS_GPS_ENABLED, m_gps->isRunning());
     settings.setValue(SETTINGS_AUTO_CENTERING_ENABLED, m_autoCenteringEnabled);
 }
@@ -319,7 +319,7 @@ void SituareEngine::initializeGpsAndAutocentering()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     QVariant gpsEnabled = settings.value(SETTINGS_GPS_ENABLED);
     QVariant autoCenteringEnabled = settings.value(SETTINGS_AUTO_CENTERING_ENABLED);
 

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 2553cd5..2bd36e5 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -36,6 +36,7 @@
 
 #include "common.h"
 #include "error.h"
+#include "network/networkcookiejar.h"
 #include "situareservice/situarecommon.h"
 #include "ui/facebookloginbrowser.h"
 
@@ -65,16 +66,17 @@ void FacebookAuthentication::clearAccountInformation(bool keepUsername)
     qDebug() << __PRETTY_FUNCTION__;
 
     ///< @todo (HIGH) clear session from SituareService
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
 
     if(!keepUsername) {
         settings.remove(SETTINGS_AUTOMATIC_UPDATE_ENABLED);
         settings.remove(SETTINGS_AUTOMATIC_UPDATE_INTERVAL);
     }
 
-    settings.remove(COOKIES);
     settings.remove(USER_UNSEND_MESSAGE);
     settings.remove(USER_UNSEND_MESSAGE_PUBLISH);
+
+    NetworkCookieJar::clearCookiesSetting();
 }
 
 void FacebookAuthentication::loadFinished(bool ok)

diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp
index 77a87f6..397365f 100644 (file)
--- a/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@ -112,7 +112,7 @@ MapEngine::~MapEngine()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
 
     settings.setValue(MAP_LAST_POSITION, QVariant::fromValue(centerGeoCoordinate()));
     settings.setValue(MAP_LAST_ZOOMLEVEL, m_zoomLevel);
@@ -294,7 +294,7 @@ void MapEngine::init()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
 
     // init can be only done if both values exists in the settings
     if (settings.contains(MAP_LAST_POSITION) && settings.contains(MAP_LAST_ZOOMLEVEL)) {

diff --git a/src/network/networkcookiejar.cpp b/src/network/networkcookiejar.cpp
index d1ccaea..3b57808 100644 (file)
--- a/src/network/networkcookiejar.cpp
+++ b/src/network/networkcookiejar.cpp
@@ -27,6 +27,8 @@
 
 #include "networkcookiejar.h"
 
+const QString COOKIES_SETTING = "cookies";
+
 NetworkCookieJar::NetworkCookieJar(QObject *parent)
     : QNetworkCookieJar(parent)
 {
@@ -42,13 +44,21 @@ NetworkCookieJar::~NetworkCookieJar()
     saveCookies();
 }
 
+void NetworkCookieJar::clearCookiesSetting()
+{
+    qWarning() << __PRETTY_FUNCTION__;
+
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
+    settings.remove(COOKIES_SETTING);
+}
+
 void NetworkCookieJar::loadCookies()
 {
     qWarning() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
 
-    QStringList list = settings.value(COOKIES, EMPTY).toStringList();
+    QStringList list = settings.value(COOKIES_SETTING).toStringList();
 
     if(!list.isEmpty()) {
         QList<QNetworkCookie> cookieList;
@@ -74,6 +84,6 @@ void NetworkCookieJar::saveCookies()
     }
     list.removeDuplicates();
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
-    settings.setValue(COOKIES, list);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
+    settings.setValue(COOKIES_SETTING, list);
 }

diff --git a/src/network/networkcookiejar.h b/src/network/networkcookiejar.h
index 8f6ef62..db942a6 100644 (file)
--- a/src/network/networkcookiejar.h
+++ b/src/network/networkcookiejar.h
@@ -39,18 +39,37 @@ public:
     /**
     * @brief Constructor
     *
+    * Calls loadCookies().
+    *
     * @param parent Instance of parent
     */
     explicit NetworkCookieJar(QObject *parent = 0);
 
+    /**
+      * @brief Destructor
+      *
+      * Calls saveCookies().
+      */
     ~NetworkCookieJar();
 
 /*******************************************************************************
  * MEMBER FUNCTIONS AND SLOTS
  ******************************************************************************/
+public:
+    /**
+      * @brief Clear cookies from settings
+      */
+    static void clearCookiesSetting();
+
 private:
+    /**
+      * @brief Load cookies from settings to jar
+      */
     void loadCookies();
 
+    /**
+      * @brief Save cookies from jar to settings
+      */
     void saveCookies();
 };
 

diff --git a/src/ui/indicatorbuttonpanel.cpp b/src/ui/indicatorbuttonpanel.cpp
index d535782..01164ef 100644 (file)
--- a/src/ui/indicatorbuttonpanel.cpp
+++ b/src/ui/indicatorbuttonpanel.cpp
@@ -76,7 +76,7 @@ IndicatorButtonPanel::IndicatorButtonPanel(QWidget *parent)
 
     setFixedSize(PANEL_WIDTH, PANEL_HEIGHT);
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     QPoint savedLocation = settings.value(DIRECTION_INDICATOR_BUTTON_POSITION,
                                           QPoint(DIRECTION_INDICATOR_POSITION_X,
                                                  DIRECTION_INDICATOR_POSITION_Y)).toPoint();
@@ -168,7 +168,7 @@ void IndicatorButtonPanel::mouseReleaseEvent(QMouseEvent *event)
     if (m_isDraggable) {
         setDraggable(false);
 
-        QSettings settings(DIRECTORY_NAME, FILE_NAME);
+        QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
         settings.setValue(DIRECTION_INDICATOR_BUTTON_POSITION, pos());
     }
 }

diff --git a/src/ui/locationsearchpanel.cpp b/src/ui/locationsearchpanel.cpp
index 5b2c911..08f24d2 100644 (file)
--- a/src/ui/locationsearchpanel.cpp
+++ b/src/ui/locationsearchpanel.cpp
@@ -136,7 +136,7 @@ LocationSearchPanel::~LocationSearchPanel()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     QList<QVariant> searchHistories;
 
     for (int i = 0; i < m_searchHistoryListView->count(); ++i) {
@@ -208,7 +208,7 @@ void LocationSearchPanel::readSettings()
 
     const int SEARCH_HISTORY_LIST_ITEM_COUNT = 2;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     QList<QVariant> searchHistories = settings.value(SETTINGS_SEARCH_HISTORY).toList();
 
     if (searchHistories.count() > 0)

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index d53c5c1..4ec70c4 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -138,7 +138,7 @@ void MainWindow::automaticUpdateDialogFinished(int result)
     if (result == QMessageBox::Yes) {
         readAutomaticLocationUpdateSettings();
     } else {
-        QSettings settings(DIRECTORY_NAME, FILE_NAME);
+        QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
         settings.setValue(SETTINGS_AUTOMATIC_UPDATE_ENABLED, false);
         readAutomaticLocationUpdateSettings();
     }
@@ -739,7 +739,7 @@ void MainWindow::readAutomaticLocationUpdateSettings()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     bool automaticUpdateEnabled = settings.value(SETTINGS_AUTOMATIC_UPDATE_ENABLED, false).toBool();
     QTime automaticUpdateInterval = settings.value(SETTINGS_AUTOMATIC_UPDATE_INTERVAL, QTime())
                                       .toTime();
@@ -752,28 +752,6 @@ void MainWindow::readAutomaticLocationUpdateSettings()
     }
 }
 
-///< @todo remove old, duplicate saveCookies()
-void MainWindow::saveCookies()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-//    if(!m_cookieJar)
-//        m_cookieJar = new NetworkCookieJar(new QNetworkCookieJar(this));
-
-//    QList<QNetworkCookie> cookieList = m_cookieJar->allCookies();
-//    QStringList list;
-
-//    for(int i=0;i<cookieList.count();i++) {
-//        QNetworkCookie cookie = cookieList.at(i);
-//        QByteArray byteArray = cookie.toRawForm(QNetworkCookie::Full);
-//        list.append(QString(byteArray));
-//    }
-//    list.removeDuplicates();
-
-//    QSettings settings(DIRECTORY_NAME, FILE_NAME);
-//    settings.setValue(COOKIES, list);
-}
-
 void MainWindow::setCrosshairVisibility(bool visibility)
 {
     qDebug() << __PRETTY_FUNCTION__;

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 0c2f464..6225bab 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -364,11 +364,6 @@ private slots:
     void moveCrosshair();
 
     /**
-     * @brief Slot to save cookies to settings
-     */
-    void saveCookies();
-
-    /**
      * @brief Slot for settings dialog accepted.
      */
     void settingsDialogAccepted();

diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
index c7b6195..570363a 100644 (file)
--- a/src/ui/settingsdialog.cpp
+++ b/src/ui/settingsdialog.cpp
@@ -137,7 +137,7 @@ void SettingsDialog::readSettings()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     bool automaticUpdateEnabled = settings.value(SETTINGS_AUTOMATIC_UPDATE_ENABLED, false).toBool();
     QTime automaticUpdateInterval = settings.value(SETTINGS_AUTOMATIC_UPDATE_INTERVAL, QTime())
                                       .toTime();
@@ -154,7 +154,7 @@ void SettingsDialog::saveValues()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     settings.setValue(SETTINGS_AUTOMATIC_UPDATE_ENABLED, m_automaticLocationUpdate->isChecked());
     settings.setValue(SETTINGS_AUTOMATIC_UPDATE_INTERVAL, time());
 

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index de6e209..eb34132 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -121,7 +121,7 @@ UserInfo::~UserInfo()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
 
     if (!m_backupMessage.isEmpty()) {
         settings.setValue(USER_UNSEND_MESSAGE, m_backupMessage.toAscii());
@@ -237,8 +237,8 @@ void UserInfo::restoreUnsendMessage()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
-    m_backupMessage = settings.value(USER_UNSEND_MESSAGE, EMPTY).toString();
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
+    m_backupMessage = settings.value(USER_UNSEND_MESSAGE).toString();
     m_backupFacebookPublishPolicity = settings.value(USER_UNSEND_MESSAGE_PUBLISH, false).toBool();
 }
 

diff --git a/src/ui/zoombuttonpanel.cpp b/src/ui/zoombuttonpanel.cpp
index 67dfba7..16b9045 100644 (file)
--- a/src/ui/zoombuttonpanel.cpp
+++ b/src/ui/zoombuttonpanel.cpp
@@ -53,7 +53,7 @@ ZoomButtonPanel::ZoomButtonPanel(QWidget *parent)
     m_panelLayout.addWidget(m_zoomInButton, 0, 0);
     m_panelLayout.addWidget(m_zoomOutButton, 1, 0);
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     QPoint savedLocation = settings.value(ZOOMPANEL_POSITION,
                                           QPoint(ZOOM_BUTTON_PANEL_POSITION_X,
                                                  ZOOM_BUTTON_PANEL_POSITION_Y)).toPoint();
@@ -134,7 +134,7 @@ void ZoomButtonPanel::mouseReleaseEvent(QMouseEvent *event)
     if(m_isDraggable) {
         setDraggable(false);
 
-        QSettings settings(DIRECTORY_NAME, FILE_NAME);
+        QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
         settings.setValue(ZOOMPANEL_POSITION, pos());
 
         releaseMouse();