mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Preferences: don't show error when resetting cloud email / password

Browse source 
Empty values won't work, of course, but they aren't an error, either.

Fixes #887

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-06-22 06:24:16 -07:00
parent a6e9db196f
commit a4168ed591
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/preferences.cpp
View file

@ -398,15 +398,17 @@ void PreferencesDialog::syncSettings()
password != prefs.cloud_storage_password) { password != prefs.cloud_storage_password) {
// different credentials - reset verification status // different credentials - reset verification status
prefs.cloud_verification_status = CS_UNKNOWN; prefs.cloud_verification_status = CS_UNKNOWN;
if (!email.isEmpty() && !password.isEmpty()) {
// connect to backend server to check / create credentials // connect to backend server to check / create credentials
QRegularExpression reg("^[a-zA-Z0-9@.+_-]+$"); QRegularExpression reg("^[a-zA-Z0-9@.+_-]+$");
if (!reg.match(email).hasMatch() || !reg.match(password).hasMatch()) { 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 '+'."))); report_error(qPrintable(tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.")));
} } else {
CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this); CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded())); connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
QNetworkReply *reply = cloudAuth->authenticate(email, password); QNetworkReply *reply = cloudAuth->authenticate(email, password);
}
}
} else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY) { } else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY) {
QString pin = ui.cloud_storage_pin->text(); QString pin = ui.cloud_storage_pin->text();
if (!pin.isEmpty()) { if (!pin.isEmpty()) {