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 <dirk@hohndel.org>

3 files changed, 1 insertions, 36 deletions

diff --git a/qt-mobile/qml/Preferences.qml b/qt-mobile/qml/Preferences.qml
index f67f99ff7..59861009c 100644
--- a/qt-mobile/qml/Preferences.qml
+++ b/qt-mobile/qml/Preferences.qml
@@ -80,17 +80,6 @@ Item {
 		}
 
 		Label {
-			text: "ID"
-			Layout.alignment: Qt.AlignRight
-		}
-
-		TextField {
-			id: userid
-			text: manager.ssrfGpsWebUserid
-			Layout.fillWidth: true
-		}
-
-		Label {
 			text: "Distance threshold (meters)"
 			Layout.alignment: Qt.AlignRight
 		}
@@ -124,7 +113,6 @@ Item {
 					manager.cloudUserName = login.text
 					manager.cloudPassword = password.text
 					manager.saveCloudPassword = savePassword.checked
-					manager.ssrfGpsWebUserid = userid.text
 					manager.distanceThreshold = distanceThreshold.text
 					manager.timeThreshold = timeThreshold.text
 					manager.savePreferences()
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;
diff --git a/qt-mobile/qmlmanager.h b/qt-mobile/qmlmanager.h
index 1d5f8e412..51b6b39d9 100644
--- a/qt-mobile/qmlmanager.h
+++ b/qt-mobile/qmlmanager.h
@@ -16,7 +16,6 @@ class QMLManager : public QObject
 	Q_PROPERTY(bool saveCloudPassword READ saveCloudPassword WRITE setSaveCloudPassword NOTIFY saveCloudPasswordChanged)
 	Q_PROPERTY(QString logText READ logText WRITE setLogText NOTIFY logTextChanged)
 	Q_PROPERTY(bool locationServiceEnabled READ locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged)
-	Q_PROPERTY(QString ssrfGpsWebUserid READ ssrfGpsWebUserid WRITE setSsrfGpsWebUserid NOTIFY ssrfGpsWebUseridChanged)
 	Q_PROPERTY(int distanceThreshold READ distanceThreshold WRITE setDistanceThreshold NOTIFY distanceThresholdChanged)
 	Q_PROPERTY(int timeThreshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged)
 public:
@@ -32,9 +31,6 @@ public:
 	bool saveCloudPassword() const;
 	void setSaveCloudPassword(bool saveCloudPassword);
 
-	QString ssrfGpsWebUserid() const;
-	void setSsrfGpsWebUserid(const QString &userid);
-
 	bool locationServiceEnabled() const;
 	void setLocationServiceEnabled(bool locationServiceEnable);
 
@@ -72,7 +68,6 @@ private:
 signals:
 	void cloudUserNameChanged();
 	void cloudPasswordChanged();
-	void ssrfGpsWebUseridChanged();
 	void saveCloudPasswordChanged();
 	void locationServiceEnabledChanged();
 	void logTextChanged();