From 18e52c1da402138a2204419bb008beb7271333bb Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 18 Nov 2015 13:12:34 -0800 Subject: QML UI: remove manual setting of web service userid It's just not user friendly to have two different user IDs for two different web services that we provide. Instead in the following commits we'll add a way to retrieve the location service web service userid with your cloud storage user id. Signed-off-by: Dirk Hohndel --- qt-mobile/qmlmanager.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'qt-mobile/qmlmanager.cpp') diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp index fe8c5ed0a..bbc5939c7 100644 --- a/qt-mobile/qmlmanager.cpp +++ b/qt-mobile/qmlmanager.cpp @@ -25,7 +25,6 @@ QMLManager::QMLManager() : setCloudUserName(prefs.cloud_storage_email); setCloudPassword(prefs.cloud_storage_password); setSaveCloudPassword(prefs.save_password_local); - setSsrfGpsWebUserid(prefs.userid); setDistanceThreshold(prefs.distance_threshold); setTimeThreshold(prefs.time_threshold / 60); if (!same_string(prefs.cloud_storage_email, "") && !same_string(prefs.cloud_storage_password, "")) @@ -39,7 +38,6 @@ QMLManager::~QMLManager() void QMLManager::savePreferences() { QSettings s; - s.setValue("subsurface_webservice_uid", ssrfGpsWebUserid()); s.beginGroup("LocationService"); s.setValue("time_threshold", timeThreshold() * 60); prefs.time_threshold = timeThreshold() * 60; @@ -56,19 +54,14 @@ void QMLManager::savePreferences() free(prefs.cloud_storage_email); prefs.cloud_storage_email = strdup(qPrintable(cloudUserName())); } - if (saveCloudPassword() != prefs.save_password_local) { + if (saveCloudPassword() != prefs.save_password_local) prefs.save_password_local = saveCloudPassword(); - } if (saveCloudPassword()) { if (!same_string(prefs.cloud_storage_password, qPrintable(cloudPassword()))) { free(prefs.cloud_storage_password); prefs.cloud_storage_password = strdup(qPrintable(cloudPassword())); } } - if (!same_string(prefs.userid, qPrintable(ssrfGpsWebUserid()))) { - free(prefs.userid); - prefs.userid = strdup(qPrintable(ssrfGpsWebUserid())); - } } void QMLManager::loadDives() @@ -238,17 +231,6 @@ void QMLManager::setCloudUserName(const QString &cloudUserName) emit cloudUserNameChanged(); } -QString QMLManager::ssrfGpsWebUserid() const -{ - return m_ssrfGpsWebUserid; -} - -void QMLManager::setSsrfGpsWebUserid(const QString &userid) -{ - m_ssrfGpsWebUserid = userid; - emit ssrfGpsWebUseridChanged(); -} - int QMLManager::distanceThreshold() const { return m_distanceThreshold; -- cgit v1.2.3-70-g09d2