1 files changed, 34 insertions, 6 deletions

diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index b30e76e03..04fb3a825 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -110,6 +110,10 @@ void PreferencesDialog::cloudPinNeeded()
 	ui.cloud_storage_pin->setVisible(prefs.cloud_verification_status == CS_NEED_TO_VERIFY);
 	ui.cloud_storage_pin_label->setEnabled(prefs.cloud_verification_status == CS_NEED_TO_VERIFY);
 	ui.cloud_storage_pin_label->setVisible(prefs.cloud_verification_status == CS_NEED_TO_VERIFY);
+	ui.cloud_storage_new_passwd->setEnabled(prefs.cloud_verification_status == CS_VERIFIED);
+	ui.cloud_storage_new_passwd->setVisible(prefs.cloud_verification_status == CS_VERIFIED);
+	ui.cloud_storage_new_passwd_label->setEnabled(prefs.cloud_verification_status == CS_VERIFIED);
+	ui.cloud_storage_new_passwd_label->setVisible(prefs.cloud_verification_status == CS_VERIFIED);
 	if (prefs.cloud_verification_status == CS_VERIFIED) {
 		ui.cloudStorageGroupBox->setTitle(tr("Subsurface cloud storage (credentials verified)"));
 		ui.cloudDefaultFile->setEnabled(true);
@@ -408,10 +412,29 @@ void PreferencesDialog::syncSettings()
 	s.beginGroup("CloudStorage");
 	QString email = ui.cloud_storage_email->text();
 	QString password = ui.cloud_storage_password->text();
-	if (prefs.cloud_verification_status == CS_UNKNOWN ||
-	    prefs.cloud_verification_status == CS_INCORRECT_USER_PASSWD ||
-	    email != prefs.cloud_storage_email ||
-	    password != prefs.cloud_storage_password) {
+	QString newpassword = ui.cloud_storage_new_passwd->text();
+	if (prefs.cloud_verification_status == CS_VERIFIED && !newpassword.isEmpty()) {
+		// deal with password change
+		if (!email.isEmpty() && !password.isEmpty()) {
+			// connect to backend server to check / create credentials
+			QRegularExpression reg("^[a-zA-Z0-9@.+_-]+$");
+			if (!reg.match(email).hasMatch() || (!password.isEmpty() && !reg.match(password).hasMatch())) {
+				report_error(qPrintable(tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.")));
+			} else {
+				CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
+				connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
+				connect(cloudAuth, SIGNAL(passwordChangeSuccessful()), this, SLOT(passwordUpdateSuccessfull()));
+				QNetworkReply *reply = cloudAuth->backend(email, password, "", newpassword);
+				ui.cloud_storage_new_passwd->setText("");
+				free(prefs.cloud_storage_newpassword);
+				prefs.cloud_storage_newpassword = strdup(qPrintable(newpassword));
+			}
+		}
+	} else if (prefs.cloud_verification_status == CS_UNKNOWN ||
+		   prefs.cloud_verification_status == CS_INCORRECT_USER_PASSWD ||
+		   email != prefs.cloud_storage_email ||
+		   password != prefs.cloud_storage_password) {
+
 		// different credentials - reset verification status
 		prefs.cloud_verification_status = CS_UNKNOWN;
 		if (!email.isEmpty() && !password.isEmpty()) {
@@ -422,7 +445,7 @@ void PreferencesDialog::syncSettings()
 			} else {
 				CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
 				connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
-				QNetworkReply *reply = cloudAuth->authenticate(email, password);
+				QNetworkReply *reply = cloudAuth->backend(email, password);
 			}
 		}
 	} else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY) {
@@ -435,7 +458,7 @@ void PreferencesDialog::syncSettings()
 			}
 			CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
 			connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
-			QNetworkReply *reply = cloudAuth->authenticate(email, password, pin);
+			QNetworkReply *reply = cloudAuth->backend(email, password, pin);
 		}
 	}
 	SAVE_OR_REMOVE("email", default_prefs.cloud_storage_email, email);
@@ -666,6 +689,11 @@ void PreferencesDialog::on_resetSettings_clicked()
 	}
 }
 
+void PreferencesDialog::passwordUpdateSuccessfull()
+{
+	ui.cloud_storage_password->setText(prefs.cloud_storage_password);
+}
+
 void PreferencesDialog::emitSettingsChanged()
 {
 	emit settingsChanged();