mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: save with unchanged credentials returns to dive list

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-06 11:42:38 -07:00
parent f21b36d9ba
commit 6a23e0ef66
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
mobile-widgets/qmlmanager.cpp
View file

@ -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)
{