Added functional test for automatic location update confirmation dialog.

diff --git a/doc/testing/functionality-tests.doc b/doc/testing/functionality-tests.doc
index aeca228..90f9807 100644 (file)
Binary files a/doc/testing/functionality-tests.doc and b/doc/testing/functionality-tests.doc differ

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 486a917..a83ff1e 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -270,13 +270,14 @@ void SituareEngine::loginActionPressed()
 
 void SituareEngine::loginOk()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
     m_loggedIn = true;
     m_ui->loggedIn(m_loggedIn);
 
     m_ui->show();
     m_situareService->fetchLocations(); // request user locations
+    m_ui->requestAutomaticLocationUpdateSettings();
 }
 
 void SituareEngine::loginProcessCancelled()

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index f376d1f..fcd87e4 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -109,7 +109,7 @@ void FacebookAuthentication::start()
 
 bool FacebookAuthentication::updateCredentials(const QUrl &url)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__ << url.toString();
 
     bool found = false;
 

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 80dd084..f6bc20a 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -559,6 +559,13 @@ void MainWindow::openSettingsDialog()
     m_settingsDialog->show();
 }
 
+void MainWindow::requestAutomaticLocationUpdateSettings()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_settingsDialog->emitAutomaticLocationUpdateSettings();
+}
+
 void MainWindow::saveCookies()
 {
     qDebug() << __PRETTY_FUNCTION__;

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 2177b3e..68ce6a6 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -100,6 +100,12 @@ public:
     void loggedIn(bool logged);
 
     /**
+    * @brief Requests automatic location update settings.
+    */
+    void requestAutomaticLocationUpdateSettings();
+
+
+    /**
     * @brief Enable / disable auto centering button.
     *
     * @param enabled true if shoud be enabled, false otherwise

diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
index 9157e23..6e20649 100644 (file)
--- a/src/ui/settingsdialog.cpp
+++ b/src/ui/settingsdialog.cpp
@@ -117,6 +117,7 @@ void SettingsDialog::setAutomaticLocationUpdateSettings(bool checked)
     qDebug() << __PRETTY_FUNCTION__;
 
     m_automaticLocationUpdate->setChecked(checked);
+    m_automaticLocationUpdateOldValue = checked;
 }
 
 void SettingsDialog::enableSituareSettings(bool enabled)
@@ -142,9 +143,19 @@ void SettingsDialog::readSettings()
         setTime(QTime::fromString(automaticUpdateInterval, "hh:mm:ss"));
         qWarning() << time().toString("hh:mm:ss");
     }
+}
 
-    if (automaticUpdateEnabled)
-        QTimer::singleShot(0, this, SLOT(saveValues()));
+void SettingsDialog::emitAutomaticLocationUpdateSettings()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    if (m_automaticLocationUpdate->isChecked()) {
+        QTime emptyTime = QTime();
+        emit enableAutomaticLocationUpdate(true, emptyTime.msecsTo(time()));
+    }
+    else {
+        emit enableAutomaticLocationUpdate(false);
+    }
 }
 
 void SettingsDialog::populateUpdateIntervalList(QStandardItemModel *model)
@@ -174,13 +185,8 @@ void SettingsDialog::saveValues()
     m_automaticLocationUpdateOldValue = m_automaticLocationUpdate->isChecked();
     m_automaticLocationUpdateIntervalOldValue = time();
 
-    if (m_automaticLocationUpdate->isChecked()) {
-        QTime emptyTime = QTime();
-        emit enableAutomaticLocationUpdate(true, emptyTime.msecsTo(time()));
-    }
-    else {
-        emit enableAutomaticLocationUpdate(false);
-    }
+    emitAutomaticLocationUpdateSettings();
+
     accept();
 }
 

diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h
index d27eda1..7e727f9 100644 (file)
--- a/src/ui/settingsdialog.h
+++ b/src/ui/settingsdialog.h
@@ -76,6 +76,11 @@ public:
     */
     void enableSituareSettings(bool enabled);
 
+    /**
+    * @brief Emits automatic location update settings.
+    */
+    void emitAutomaticLocationUpdateSettings();
+
 private slots:
     /**
     * @brief Saves settings to file.