QML UI: remove the checkbox for remembering the password

In the context of the mobile app this simply makes no sense. If the user
doesn't select this option, the app doesn't really work. So why have the option
in the first place?

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

3 files changed, 4 insertions, 36 deletions

diff --git a/qt-mobile/qml/CloudCredentials.qml b/qt-mobile/qml/CloudCredentials.qml
index 73722d3a0..b31e59c03 100644
--- a/qt-mobile/qml/CloudCredentials.qml
+++ b/qt-mobile/qml/CloudCredentials.qml
@@ -17,7 +17,6 @@ Item {
 	function saveCredentials() {
 		manager.cloudUserName = login.text
 		manager.cloudPassword = password.text
-		manager.saveCloudPassword = savePassword.checked
 		manager.saveCloudCredentials()
 	}
 
@@ -68,14 +67,6 @@ Item {
 			MobileComponents.Label {
 				text: "Show password"
 			}
-
-			CheckBox {
-				checked: manager.saveCloudPassword
-				id: savePassword
-			}
-			MobileComponents.Label {
-				text: "Remember"
-			}
 		}
 		Item { width: MobileComponents.Units.gridUnit; height: width }
 	}
diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp
index e372ca539..301a02ce1 100644
--- a/qt-mobile/qmlmanager.cpp
+++ b/qt-mobile/qmlmanager.cpp
@@ -103,7 +103,6 @@ void QMLManager::finishSetup()
 	// Initialize cloud credentials.
 	setCloudUserName(prefs.cloud_storage_email);
 	setCloudPassword(prefs.cloud_storage_password);
-	setSaveCloudPassword(prefs.save_password_local);
 	// if the cloud credentials are valid, we should get the GPS Webservice ID as well
 	QString url;
 	if (!cloudUserName().isEmpty() &&
@@ -149,25 +148,19 @@ void QMLManager::saveCloudCredentials()
 	bool cloudCredentialsChanged = false;
 	s.beginGroup("CloudStorage");
 	s.setValue("email", cloudUserName());
-	s.setValue("save_password_local", saveCloudPassword());
-	if (saveCloudPassword())
-		s.setValue("password", cloudPassword());
+	s.setValue("password", cloudPassword());
 	s.sync();
 	if (!same_string(prefs.cloud_storage_email, qPrintable(cloudUserName()))) {
 		free(prefs.cloud_storage_email);
 		prefs.cloud_storage_email = strdup(qPrintable(cloudUserName()));
 		cloudCredentialsChanged = true;
 	}
-	if (saveCloudPassword() != prefs.save_password_local)
-		prefs.save_password_local = saveCloudPassword();
 
 	cloudCredentialsChanged |= !same_string(prefs.cloud_storage_password, qPrintable(cloudPassword()));
 
-	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.cloud_storage_password, qPrintable(cloudPassword()))) {
+		free(prefs.cloud_storage_password);
+		prefs.cloud_storage_password = strdup(qPrintable(cloudPassword()));
 	}
 	if (cloudUserName().isEmpty() || cloudPassword().isEmpty()) {
 		setStartPageText(RED_FONT + tr("Please enter valid cloud credentials.") + END_FONT);
@@ -852,16 +845,6 @@ void QMLManager::appendTextToLog(const QString &newText)
 	emit logTextChanged();
 }
 
-bool QMLManager::saveCloudPassword() const
-{
-	return m_saveCloudPassword;
-}
-
-void QMLManager::setSaveCloudPassword(bool saveCloudPassword)
-{
-	m_saveCloudPassword = saveCloudPassword;
-}
-
 bool QMLManager::locationServiceEnabled() const
 {
 	return m_locationServiceEnabled;
diff --git a/qt-mobile/qmlmanager.h b/qt-mobile/qmlmanager.h
index 01ccf0303..ae30d5884 100644
--- a/qt-mobile/qmlmanager.h
+++ b/qt-mobile/qmlmanager.h
@@ -13,7 +13,6 @@ class QMLManager : public QObject {
 	Q_ENUMS(credentialStatus_t)
 	Q_PROPERTY(QString cloudUserName READ cloudUserName WRITE setCloudUserName NOTIFY cloudUserNameChanged)
 	Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged)
-	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(int distanceThreshold READ distanceThreshold WRITE setDistanceThreshold NOTIFY distanceThresholdChanged)
@@ -44,9 +43,6 @@ public:
 	QString cloudPassword() const;
 	void setCloudPassword(const QString &cloudPassword);
 
-	bool saveCloudPassword() const;
-	void setSaveCloudPassword(bool saveCloudPassword);
-
 	bool locationServiceEnabled() const;
 	void setLocationServiceEnabled(bool locationServiceEnable);
 
@@ -125,7 +121,6 @@ private:
 	QString m_cloudPassword;
 	QString m_ssrfGpsWebUserid;
 	QString m_startPageText;
-	bool m_saveCloudPassword;
 	QString m_logText;
 	bool m_locationServiceEnabled;
 	bool m_verboseEnabled;
@@ -145,7 +140,6 @@ private:
 signals:
 	void cloudUserNameChanged();
 	void cloudPasswordChanged();
-	void saveCloudPasswordChanged();
 	void locationServiceEnabledChanged();
 	void verboseEnabledChanged();
 	void logTextChanged();