From 6ea3fd3d92fdfeeaed64315ed31bb8e97c107f6b Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Wed, 27 Sep 2017 18:19:53 +0200 Subject: mobile: do not care about email/passwd when NOCLOUD In case the credential state is NOCLOUD, the saving of credentials in the preferences was suppressed in case of invalid data in the email/passwd fields. There is no reason to check these fields for correct input, as they are not used in case of NOCLOUD mode. A simple if statement is added. Signed-off-by: Jan Mulder --- mobile-widgets/qmlmanager.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 3961cc5cf..6292f95fe 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -320,15 +320,18 @@ void QMLManager::saveCloudCredentials() QRegularExpression regExp("^[a-zA-Z0-9@.+_-]+$"); QString cloudPwd = cloudPassword(); QString cloudUser = cloudUserName(); - if (cloudPwd.isEmpty() || !regExp.match(cloudPwd).hasMatch() || !regExp.match(cloudUser).hasMatch()) { - setStartPageText(RED_FONT + tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.") + END_FONT); - return; - } - // use the same simplistic regex as the backend to check email addresses - regExp = QRegularExpression("^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9.+_-]+\\.[a-zA-Z0-9]+"); - if (!regExp.match(cloudUser).hasMatch()) { - setStartPageText(RED_FONT + tr("Invalid format for email address") + END_FONT); - return; + if (credentialStatus() != CS_NOCLOUD) { + // in case of NO_CLOUD, the email address + passwd do not care, so do not check it. + if (cloudPwd.isEmpty() || !regExp.match(cloudPwd).hasMatch() || !regExp.match(cloudUser).hasMatch()) { + setStartPageText(RED_FONT + tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.") + END_FONT); + return; + } + // use the same simplistic regex as the backend to check email addresses + regExp = QRegularExpression("^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9.+_-]+\\.[a-zA-Z0-9]+"); + if (!regExp.match(cloudUser).hasMatch()) { + setStartPageText(RED_FONT + tr("Invalid format for email address") + END_FONT); + return; + } } setOldStatus(credentialStatus()); s.beginGroup("CloudStorage"); -- cgit v1.2.3-70-g09d2