From a4168ed5917457a041303a05e4644e8a0fa4294a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 22 Jun 2015 06:24:16 -0700 Subject: [PATCH] Preferences: don't show error when resetting cloud email / password Empty values won't work, of course, but they aren't an error, either. Fixes #887 Signed-off-by: Dirk Hohndel --- qt-ui/preferences.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 9d018815b..127320566 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -398,15 +398,17 @@ void PreferencesDialog::syncSettings() password != prefs.cloud_storage_password) { // different credentials - reset verification status prefs.cloud_verification_status = CS_UNKNOWN; - - // connect to backend server to check / create credentials - QRegularExpression reg("^[a-zA-Z0-9@.+_-]+$"); - if (!reg.match(email).hasMatch() || !reg.match(password).hasMatch()) { - report_error(qPrintable(tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'."))); + 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())); + QNetworkReply *reply = cloudAuth->authenticate(email, password); + } } - CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this); - connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded())); - QNetworkReply *reply = cloudAuth->authenticate(email, password); } else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY) { QString pin = ui.cloud_storage_pin->text(); if (!pin.isEmpty()) {