FCL/sf/mw/accesssec: comparison securitysettings/cpeapuiplugins/cpeapuserpasswordui/src/cpeapuserpasswordui.cpp

equal deleted inserted replaced

-:7a0216d033ac
+:fe6b6762fccd
 /*
 * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *   Control Panel QT UI for username-password based EAP method configuration
 *
 */
 /*
-* %version: 24 %
+* %version: 27 %
 */
 // System includes
 #include <HbDataForm>
 #include <HbDataFormModel>
 #include <HbDataFormViewItem>
+#include <HbParameterLengthLimiter>
 #include <HbMessageBox>
 #include <HbAction>
 #include <HbLineEdit>
 #include <cpsettingformitemdata.h>
 #include <cpitemdatahelper.h>
 CpEapUserPasswordUi::CpEapUserPasswordUi(
 const EapQtConfigInterface::EapBearerType bearer,
 const int iapId,
 const EapQtPluginInfo &plugin,
 const EapQtPluginHandle& outerHandle) :
-mConfigIf(new EapQtConfigInterface(bearer, iapId)),
+mConfigIf(NULL),
 mPluginInfo(plugin),
 mOuterHandle(outerHandle),
 mForm(NULL),
 mModel(NULL),
+mItemDataHelper(NULL),
+mGroupItem(NULL),
 mUsername(NULL),
 mPasswordPrompt(NULL),
 mPassword(NULL),
 mValidatorUsername(NULL),
 mValidatorPassword(NULL),
 if (iapId < 0) {
 QT_THROW(std::bad_alloc());
 // scoped pointer gets deleted automaticaly on exception
 }
-initializeUserPasswordUi();
+// Get EAP config interface
+mConfigIf.reset(new EapQtConfigInterface(bearer, iapId));
+createUi();
 }
 /*!
 * Destructor.
 */
 // mValidatorUsername, mValidatorPassword
 // mConfigIf: scoped pointer deleted automatically
 }
 /*!
-* Initializes the password-username ui and initializes objects based on configuration
+* Creates username-password UI and initilizes settings read via
-* read from the database.
+* EapQtConfigInterface
 */
-void CpEapUserPasswordUi::initializeUserPasswordUi()
+void CpEapUserPasswordUi::createUi()
 {
-qDebug("CpEapUserPasswordUi::initializeUserPasswordUi");
+qDebug("CpEapUserPasswordUi::createUi");
-CpItemDataHelper itemDataHelper;
 // Read Configurations
-EapQtConfig eapConfig;
 bool configurationRead = mConfigIf->readConfiguration(mOuterHandle, mPluginInfo.pluginHandle(),
-eapConfig);
+mEapConfig);
 if (!configurationRead) {
 qDebug("CpEapUserPasswordUi::initializeUserPasswordUi - read configuration failed.");
 }
-// Create UI objects and group
+// Construct username-password UI
 mForm = new HbDataForm();
 this->setWidget(mForm);
+mModel = new HbDataFormModel(mForm);
-mModel = new HbDataFormModel;
+// Create settings group
-HbDataFormModelItem *groupItem = new HbDataFormModelItem(HbDataFormModelItem::GroupItem,
+mGroupItem = new HbDataFormModelItem(HbDataFormModelItem::GroupItem,
-hbTrId("txt_occ_subhead_eap_module_settings").arg(mPluginInfo.localizationId()));
+HbParameterLengthLimiter(
-mModel->appendDataFormItem(groupItem);
+hbTrId("txt_occ_subhead_eap_module_settings")).arg(
+mPluginInfo.localizationId()));
+mModel->appendDataFormItem(mGroupItem);
+// The parameter given as 0 is a HbDataForm pointer, not parent
+mItemDataHelper = new CpItemDataHelper(0);
+mItemDataHelper->setParent(this);
+// Create UI components
+createUsername();
+createPassword();
+mItemDataHelper->bindToForm(mForm);
+mForm->setModel(mModel);
 // Connect signal to add validators when items get activated (visualization created).
 bool connected = connect(mForm, SIGNAL( itemShown(const QModelIndex&) ), this,
 SLOT( setValidator(const QModelIndex) ));
 Q_ASSERT(connected);
+// Expand username-password settings group
+mForm->setExpanded(mModel->indexFromItem(mGroupItem), true);
+}
+/*!
+* Creates Username lineEdit
+*/
+void CpEapUserPasswordUi::createUsername()
+{
+qDebug("CpEapUserPasswordUi::createUsername()");
 // Username
 mUsername = new CpSettingFormItemData(HbDataFormModelItem::TextItem, hbTrId(
-"txt_occ_setlabel_username"));
+"txt_occ_setlabel_user_name"));
 // Initialize the value from EapQtConfig
-mUsername->setContentWidgetData("text", eapConfig.value(EapQtConfig::Username));
+mUsername->setContentWidgetData("text", mEapConfig.value(EapQtConfig::Username));
-groupItem->appendChild(mUsername);
+mGroupItem->appendChild(mUsername);
+}
+/*!
+* Creates Password group:
+* Prompt checkBox and password lineEdit
+*/
+void CpEapUserPasswordUi::createPassword()
+{
+qDebug("CpEapUserPasswordUi::createPassword()");
 // Password prompting
 mPasswordPrompt = new CpSettingFormItemData(HbDataFormModelItem::CheckBoxItem, hbTrId(
 "txt_occ_setlabel_password"));
 mPasswordPrompt->setContentWidgetData("text", hbTrId("txt_occ_setlabel_password_val_prompt"));
-mPasswordPrompt->setContentWidgetData("checkState", boolToCheckState(eapConfig.value(
+mPasswordPrompt->setContentWidgetData("checkState", boolToCheckState(mEapConfig.value(
 EapQtConfig::PasswordPrompt).toBool()));
 // Connect signal to disable/enable password when passwordPrompt changed
 mForm->addConnection(mPasswordPrompt, SIGNAL(stateChanged(int)), this,
 SLOT(passwordPromptChanged(int)));
-groupItem->appendChild(mPasswordPrompt);
+mGroupItem->appendChild(mPasswordPrompt);
 // Password
 mPassword = new CpSettingFormItemData(HbDataFormModelItem::TextItem, hbTrId(
 "txt_occ_setlabel_password"));
-mPasswordStored = eapConfig.value(EapQtConfig::PasswordStored).toBool();
+mPasswordStored = mEapConfig.value(EapQtConfig::PasswordStored).toBool();
 // If password has already been stored into the databse
 // fixed number of asterisks are shown in UI
 if (mPasswordStored) {
 mPassword->setContentWidgetData("text", passwordExistString);
 }
 // Set password echo mode
 mPassword->setContentWidgetData("echoMode", HbLineEdit::Password);
-// Dimmed password if passwordPrompt is selected
+// Dim password if passwordPrompt is selected
 passwordPromptChanged(mPasswordPrompt->contentWidgetData("checkState") == Qt::Checked);
 // Connect signal to get info that user has changed the password
 mForm->addConnection(mPassword, SIGNAL(editingFinished()), this, SLOT(passwordChanged()));
-groupItem->appendChild(mPassword);
+mGroupItem->appendChild(mPassword);
-// Set the model
-mForm->setModel(mModel);
-itemDataHelper.bindToForm(mForm);
-// Expand userpasswordui settings group
-mForm->setExpanded(mModel->indexFromItem(groupItem), TRUE);
 }
 /*!
 * Adds validators and connects focusIn event to the Password.
 *
 *
 */
 void CpEapUserPasswordUi::close()
 {
 qDebug("CpEapUserPasswordUi::close");
+// Validate configuration
 if (validate()) {
-qDebug("CpEapUserPasswordUi::close - Store settings");
+qDebug("CpEapUserPasswordUi::close - Validation OK");
-storeSettings();
-qDebug("CpEapUserPasswordUi::close - Settings stored, exit");
+// Store settings
-CpBaseSettingView::close();
+if (storeSettings()){
+qDebug("CpEapUserPasswordUi::close - Settings stored, close view");
+// Close view
+CpBaseSettingView::close();
+}
+else {
+qDebug("CpEapUserPasswordUi::close - Store settings failed, prompt warning");
+// Store failed. Show error note to user
+QScopedPointer<HbMessageBox> infoBox;
+infoBox.reset(new HbMessageBox(
+HbMessageBox::MessageTypeWarning));
+infoBox->setAttribute(Qt::WA_DeleteOnClose);
+infoBox->setText(hbTrId("txt_occ_info_unable_to_save_setting"));
+infoBox->clearActions();
+// Connect 'OK'-button to CpBaseSettingView 'aboutToClose'-signal
+HbAction *okAction = new HbAction(hbTrId("txt_common_button_ok"));
+infoBox->addAction(okAction);
+bool connected = connect(
+okAction,
+SIGNAL(triggered()),
+this,
+SIGNAL(aboutToClose()));
+Q_ASSERT(connected);
+infoBox->open();
+infoBox.take();
+}
 }
 else {
 qDebug("CpEapUserPasswordUi::close - validation failed. Prompt question.");
-HbMessageBox *note = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-note->setAttribute(Qt::WA_DeleteOnClose);
+// Validate failed. Request user to exit anyway
-note->setText(hbTrId("txt_occ_info_incomplete_details_return_without_sa"));
+QScopedPointer<HbMessageBox> messageBox;
-note->clearActions();
+messageBox.reset(new HbMessageBox(
+HbMessageBox::MessageTypeQuestion));
+messageBox->setAttribute(Qt::WA_DeleteOnClose);
+messageBox->setText(hbTrId("txt_occ_info_incomplete_details_return_without_sa"));
+messageBox->clearActions();
 // Connect 'YES'-button to CpBaseSettingView 'aboutToClose'-signal
 HbAction *okAction = new HbAction(hbTrId("txt_common_button_yes"));
-note->addAction(okAction);
+messageBox->addAction(okAction);
 bool connected = connect(
 okAction,
 SIGNAL(triggered()),
 this,
 SIGNAL(aboutToClose()));
 Q_ASSERT(connected);
 // Clicking 'NO'-button does nothing
 HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_no"));
-note->addAction(cancelAction);
+messageBox->addAction(cancelAction);
-note->setTimeout(HbPopup::NoTimeout);
+messageBox->setTimeout(HbPopup::NoTimeout);
-note->open();
+messageBox->open();
+messageBox.take();
 }
 }
 /*!
 * Converts check box state to boolean.
 * Saves information that password has been changed and must be stored.
 * If the new password is not given, the stored password is kept (if exists).
 */
 void CpEapUserPasswordUi::passwordChanged()
 {
-if (mPassword->contentWidgetData("text") != "") {
+if (mPassword->contentWidgetData("text").toString().length() > 0) {
 // Stored password is considered as changed only if user
 // gives new unempty password
 qDebug("CpEapUserPasswordUi::passwordChanged");
 mPasswordChanged = true;
 }
 bool CpEapUserPasswordUi::validate()
 {
 qDebug("CpEapUserPasswordUi::validate");
 bool valid = false;
-if ((EapQtValidator::StatusOk == mValidatorUsername->validate(mUsername->contentWidgetData(
+if (validateUsername()
-"text"))) && validatePasswordGroup()) {
+&& validatePasswordGroup()) {
 qDebug("CpEapUserPasswordUi::validate - OK");
 valid = true;
 }
 return valid;
+}
+/*!
+* Validates username
+*
+* @return true if OK, false otherwise
+*/
+bool CpEapUserPasswordUi::validateUsername()
+{
+qDebug("CpEapUserPasswordUi::validateUsername");
+bool status = false;
+// true if (given username is valid) or
+// (password prompt is on and username is empty)
+if ((EapQtValidator::StatusOk == mValidatorUsername->validate(
+mUsername->contentWidgetData("text")))
+|| (mPasswordPrompt->contentWidgetData("checkState") == Qt::Checked
+&& mUsername->contentWidgetData("text").toString().length() == 0)) {
+qDebug("CpEapUserPasswordUi::validateUsername - OK");
+status = true;
+}
+return status;
 }
 /*!
 * Validates password and passwordPrompt.
 *
 return status;
 }
 /*!
 * Stores settings given via username-password configuration UI
-*/
+*
-void CpEapUserPasswordUi::storeSettings()
+* @return false if saving failed, true otherwisev
+*/
+bool CpEapUserPasswordUi::storeSettings()
 {
 qDebug("CpEapUserPasswordUi::storeSettings");
 EapQtConfig eapConfig;
 // Store the new password
 eapConfig.setValue(EapQtConfig::Password, mPassword->contentWidgetData("text").toString());
 }
 }
+// Save configuration
 if (!mConfigIf->saveConfiguration(mPluginInfo.pluginHandle(), eapConfig)) {
 qDebug("CpEapUserPasswordUi::storeSettings - configuration saving failed.");
-}
+return false;
 }
+return true;
+}

changeset 39	fe6b6762fccd
parent 33	938269283a16
child 52	c23bdf5a328a