From 6a23e0ef664d081ec9351603c76af8c46edd4e89 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 6 Apr 2016 11:42:38 -0700 Subject: QML UI: save with unchanged credentials returns to dive list If the user is on the credentials page, doesn't change the credentials but simply taps on save, they now get back to the dive list. Fixes #1047 Signed-off-by: Dirk Hohndel --- mobile-widgets/qmlmanager.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'mobile-widgets/qmlmanager.cpp') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index d030f5a72..3d478178d 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -213,6 +213,10 @@ void QMLManager::saveCloudCredentials() cloudCredentialsChanged |= !same_string(prefs.cloud_storage_password, qPrintable(cloudPassword())); + if (!cloudCredentialsChanged) { + // just go back to the dive list + setCredentialStatus(oldStatus()); + } if (!same_string(prefs.cloud_storage_password, qPrintable(cloudPassword()))) { free(prefs.cloud_storage_password); prefs.cloud_storage_password = strdup(qPrintable(cloudPassword())); @@ -1014,6 +1018,19 @@ void QMLManager::setCredentialStatus(const credentialStatus_t value) } } +QMLManager::credentialStatus_t QMLManager::oldStatus() const +{ + return m_oldStatus; +} + +void QMLManager::setOldStatus(const credentialStatus_t value) +{ + if (m_oldStatus != value) { + m_oldStatus = value; + emit oldStatusChanged(); + } +} + // where in the QML dive list is that dive? int QMLManager::getIndex(const QString &diveId) { -- cgit v1.2.3-70-g09d2