# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282114256 -10800 # Node ID 53085837e73ab565e46260bce12eee5a09704ad4 # Parent fe6b6762fccdfa0acf213f2e3f00e7ac6e5d9c5e Revision: 201029 Kit: 201033 diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/am/include/eap_am_tools.h --- a/eapol/eapol_framework/eapol_common/am/include/eap_am_tools.h Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/am/include/eap_am_tools.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: % +* %version: 8.1.2 % */ #if !defined( _EAP_AM_TOOLS_H_ ) @@ -120,6 +120,7 @@ eap_trace_mask_hash_map = (1u << 13u), ///< This value traces only data of hash table. It does map data and selector. eap_trace_mask_timer_queue = (1u << 14u), ///< This value traces the timer queue. eap_trace_mask_ok_returns = (1u << 15u), ///< This value traces the OK return values, alot of them. + eap_trace_mask_trace_never = (1u << 16u), ///< This value never traces. This can disable trace always. }; EAP_FUNC_IMPORT u8_t octet_to_ascii(i32_t octet); @@ -321,6 +322,8 @@ const u32_t TRACE_FLAGS_OK_RETURNS = eap_am_tools_c::eap_trace_mask_ok_returns; +const u32_t EAP_TRACE_FLAGS_NEVER = eap_am_tools_c::eap_trace_mask_trace_never; + //----------------------------------------------------------------------------------------------- #if !defined(USE_EAP_STATUS_RETURN) diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/common/eap_tlv_message_data.cpp --- a/eapol/eapol_framework/eapol_common/common/eap_tlv_message_data.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/common/eap_tlv_message_data.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: % +* %version: 19.1.2 % */ // This is enumeration of EAPOL source code. @@ -138,7 +138,7 @@ EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("set_message_data()"), value, length)); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/core/eap_core_client_message_if.cpp --- a/eapol/eapol_framework/eapol_common/core/eap_core_client_message_if.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/core/eap_core_client_message_if.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 32 % +* %version: 34 % */ // This is enumeration of EAPOL source code. @@ -116,11 +116,18 @@ { // Sends message data composed of Attribute-Value Pairs. + EAP_TRACE_DEBUG( + m_am_tools, + EAP_TRACE_FLAGS_MESSAGE_DATA, + (EAPL("eap_core_client_message_if_c::process_message(): this = 0x%08x => 0x%08x.\n"), + this, + dynamic_cast(this))); + EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_core_client_message_if_c::send_message()"); EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eap_core_client_message_if_c::send_message()"), message->get_message_data(), message->get_message_data_length())); @@ -1389,7 +1396,7 @@ EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eap_core_client_message_if_c::send_data()"), message.get_message_data(), message.get_message_data_length())); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/core/eap_core_server_message_if.cpp --- a/eapol/eapol_framework/eapol_common/core/eap_core_server_message_if.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/core/eap_core_server_message_if.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 32 % +* %version: 33 % */ // This is enumeration of EAPOL source code. @@ -262,9 +262,16 @@ { // Sends message data composed of Attribute-Value Pairs. + EAP_TRACE_DEBUG( + m_am_tools, + EAP_TRACE_FLAGS_MESSAGE_DATA, + (EAPL("eap_core_server_message_if_c::send_message(): this = 0x%08x => 0x%08x.\n"), + this, + dynamic_cast(this))); + EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eap_core_client_message_if_c::send_message()"), message->get_message_data(), message->get_message_data_length())); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/core/eap_general_settings_server_message_if.cpp --- a/eapol/eapol_framework/eapol_common/core/eap_general_settings_server_message_if.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/core/eap_general_settings_server_message_if.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 13 % +* %version: 14 % */ // This is enumeration of EAPOL source code. @@ -214,9 +214,16 @@ { // Sends message data composed of Attribute-Value Pairs. + EAP_TRACE_DEBUG( + m_am_tools, + EAP_TRACE_FLAGS_MESSAGE_DATA, + (EAPL("eap_general_settings_server_message_if_c::send_message(): this = 0x%08x => 0x%08x.\n"), + this, + dynamic_cast(this))); + EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eap_core_client_message_if_c::send_message()"), message->get_message_data(), message->get_message_data_length())); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/core/eap_plugin_server_message_if.cpp --- a/eapol/eapol_framework/eapol_common/core/eap_plugin_server_message_if.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/core/eap_plugin_server_message_if.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 13 % +* %version: 14 % */ // This is enumeration of EAPOL source code. @@ -219,9 +219,16 @@ { // Sends message data composed of Attribute-Value Pairs. + EAP_TRACE_DEBUG( + m_am_tools, + EAP_TRACE_FLAGS_MESSAGE_DATA, + (EAPL("eap_plugin_server_message_if_c::send_message(): this = 0x%08x => 0x%08x.\n"), + this, + dynamic_cast(this))); + EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eap_core_client_message_if_c::send_message()"), message->get_message_data(), message->get_message_data_length())); @@ -274,7 +281,7 @@ EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eap_plugin_server_message_if_c::process_message()"), message->get_message_data(), message->get_message_data_length())); @@ -404,7 +411,7 @@ { EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eap_plugin_server_message_if_c::process_data()"), data, length)); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/core/eapol_message_wlan_authentication.cpp --- a/eapol/eapol_framework/eapol_common/core/eapol_message_wlan_authentication.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/core/eapol_message_wlan_authentication.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 60 % +* %version: 62 % */ // This is enumeration of EAPOL source code. @@ -1104,9 +1104,16 @@ { // Sends message data composed of Attribute-Value Pairs. + EAP_TRACE_DEBUG( + m_am_tools, + EAP_TRACE_FLAGS_MESSAGE_DATA, + (EAPL("TIMER: eapol_message_wlan_authentication_c::send_message()\n"))); + + EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eapol_message_wlan_authentication_c::send_message()"); + EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eapol_message_wlan_authentication_c::send_message()"), message->get_message_data(), message->get_message_data_length())); @@ -1199,6 +1206,13 @@ { // Parses message data composed of Attribute-Value Pairs. + EAP_TRACE_DEBUG( + m_am_tools, + EAP_TRACE_FLAGS_MESSAGE_DATA, + (EAPL("TIMER: eapol_message_wlan_authentication_c::process_data()\n"))); + + EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eapol_message_wlan_authentication_c::process_data()"); + eap_status_e status(eap_status_ok); #if defined(USE_EAPOL_WLAN_AUTHENTICATION_MESSAGE_ASYNCRONOUS_TEST) @@ -1303,9 +1317,16 @@ { // Parses message data composed of Attribute-Value Pairs. + EAP_TRACE_DEBUG( + m_am_tools, + EAP_TRACE_FLAGS_MESSAGE_DATA, + (EAPL("TIMER: eapol_message_wlan_authentication_c::process_message()\n"))); + + EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eapol_message_wlan_authentication_c::process_message()"); + EAP_TRACE_DATA_DEBUG( m_am_tools, - EAP_TRACE_FLAGS_MESSAGE_DATA, + EAP_TRACE_FLAGS_NEVER, (EAPL("eapol_message_wlan_authentication_c::process_message()"), message->get_message_data(), message->get_message_data_length())); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/include/eap_expanded_type.h --- a/eapol/eapol_framework/eapol_common/include/eap_expanded_type.h Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/include/eap_expanded_type.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 17 % +* %version: 18 % */ #if !defined(_EAP_EXPANDED_TYPE_H_) @@ -66,12 +66,6 @@ eap_type_fast = 43, ///< This is EAP-FAST type. #endif //#if defined(USE_FAST_EAP_TYPE) - eap_type_ttls_plain_pap = 98, // This is for TTLS/PAP. - -#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK) - eap_type_plain_mschapv2 = 99, ///< This is used to indicate plain MSChapv2 inside TTLS tunnel. -#endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK) - eap_type_saesim = 252, ///< This is just a test EAP-type. eap_type_dummy_sim = 253, ///< This is just a test EAP-type. @@ -91,9 +85,9 @@ { eap_type_vendor_type_secure_easy_setup = 10, eap_type_vendor_type_WFA_simple_config = 1, - eap_type_vendor_type_ttls_plain_pap_hack = eap_type_ttls_plain_pap, // This is for TTLS/PAP. + eap_type_vendor_type_ttls_plain_pap_hack = 98, // This is for TTLS/PAP. #if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK) - eap_type_vendor_type_plain_MSCHAPv2_hack = eap_type_plain_mschapv2, // This is for plain MCHAPv2 and TTLS + eap_type_vendor_type_plain_MSCHAPv2_hack = 99, // This is for plain MCHAPv2 and TTLS #endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK) }; diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_application_eap_core.cpp --- a/eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_application_eap_core.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_application_eap_core.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: % +* %version: 99 % */ // This is enumeration of EAPOL source code. @@ -677,7 +677,7 @@ status = m_eap_core->configure(); - if (m_peap_tunneled_eap_type == eap_type_ttls_plain_pap) + if (m_peap_tunneled_eap_type == eap_expanded_type_ttls_plain_pap.get_type()) { if (m_free_eap_core == true) { diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/core/symbian/file_config/eap_symbian.conf --- a/eapol/eapol_framework/eapol_symbian/am/core/symbian/file_config/eap_symbian.conf Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/core/symbian/file_config/eap_symbian.conf Wed Aug 18 09:50:56 2010 +0300 @@ -1,18 +1,20 @@ # -# Name : ./wlan_symbian/wlaneapol_symbian/am/core/symbian/file_config/eap_symbian.conf -# Part of : EAPOL / -# Description : Configuration file for EAPOL. -# Version : %version: 15.1.4 % -# -# Copyright © 2001-2005 Nokia. All rights reserved. -# This material, including documentation and any related -# computer programs, is protected by copyright controlled by -# Nokia. All rights are reserved. Copying, including -# reproducing, storing, adapting or translating, any -# or all of this material requires the prior written consent of -# Nokia. This material also contains confidential -# information which may not be disclosed to others without the -# prior written consent of Nokia. +# 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 "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. +# +# Contributors: +# +# Description: +# EAP configuration file +# +# %version: 17 % # EAP_TRACE_disable_traces = bool:false @@ -153,7 +155,4 @@ EAP_SIMPLE_CONFIG_manual_username = string:WFA-SimpleConfig-Enrollee-1-0 -# JPH: This is for testing, remove after the QT UI works. -#EAP_TLS_PEAP_use_automatic_ca_certificate = bool:true - # end diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/core/symbian/file_config/eap_trace.conf --- a/eapol/eapol_framework/eapol_symbian/am/core/symbian/file_config/eap_trace.conf Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/core/symbian/file_config/eap_trace.conf Wed Aug 18 09:50:56 2010 +0300 @@ -1,3 +1,23 @@ +# +# 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 "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. +# +# Contributors: +# +# Description: +# EAP configuration file +# +# %version: 3 % +# + + #-------------------------------------------------------------------- # This string configuration option selects file and path name of trace log file. diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_notifier.h --- a/eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_notifier.h Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_notifier.h Wed Aug 18 09:50:56 2010 +0300 @@ -11,20 +11,34 @@ * * Contributors: * -* Description: EAP Auth Notifier +* Description: EAP Authentication Notifier * */ /* -* %version: 3 % +* %version: 15 % */ #ifndef __EAPAUTHNOTIFIER_H__ #define __EAPAUTHNOTIFIER_H__ +// System includes #include #include +// User includes + +// Forward declarations + +class TEapExpandedType; +class CEapAuthObserver; + +// External data types + +//Global function prototypes + +//Constants + const TUint KMaxNotifItemLength = 256; const TUint KMaxUiDataLength = 1024; @@ -34,17 +48,24 @@ class MNotificationCallback { public: + /** + * Notify for the client that the Dialog is complete + * + * @param aStatus status + * return - + */ virtual void DlgComplete( TInt aStatus ) = 0; }; -class TEapExpandedType; -class CEapAuthObserver; - - +/** + * EAP Notifier + */ NONSHARABLE_CLASS ( CEapAuthNotifier ): public CBase { public: + // Data types + /** EAP Notifier types */ enum EEapNotifierType { EEapNotifierTypeLEapUsernamePasswordDialog, @@ -68,6 +89,7 @@ EEapNotifierTypeGTCUsernamePasswordDialog, }; + /** EAP Notifier Data struct */ struct TEapDialogInfo { TBool iPasswordPromptEnabled; @@ -78,7 +100,7 @@ TBool iIsFirstQuery; TBuf16 iUidata; }; - + /** * Two-phased constructor. */ @@ -88,9 +110,11 @@ * Destructor */ ~CEapAuthNotifier(); - + + public: /** * Start the Notifier + * * @param aType notifier type * @param aPasswordInfo data to be filled * @param aEapType eap type @@ -102,14 +126,15 @@ /** * Cancel() the notifier + * * @param - * return - */ IMPORT_C void Cancel(); - - public: + /** * CompleteL the notifier is complete + * * @param aStatus status * return - */ @@ -117,6 +142,7 @@ /** * Sets the selected user name and password of the presented dialog + * * @param aPasswordInfo password * return - */ @@ -124,6 +150,7 @@ /** * Sets the selected password of the presented dialog + * * @param aPasswordInfo password * return - */ @@ -132,6 +159,7 @@ /** * Sets the selected Old password of the presented dialog + * * @param aPasswordInfo old password * return - */ @@ -151,10 +179,11 @@ /** * Set data for the UsernamePassword Dialog(s) + * * @param aPasswordInfo data to be filled * @param aEapType Eap type to be used * @param aMap Pointer to variant data - * @param aAuthMethod Auth method to be used + * @param aAuthMethod Authentication method to be used * return - */ void SetUsernamePasswordDataL( @@ -166,9 +195,10 @@ /** * Set data for the query Dialog(s) + * * @param aEapInfo data to be filled * @param aMap Pointer to variant data - * @param aAuthMethod Auth method to be used + * @param aAuthMethod Authentication method to be used * return - */ void SetQueryDialogDataL( @@ -178,6 +208,7 @@ /** * Set data for the Install Pac query Dialog(s) + * * @param aEapInfo data to be filled * @param aMap Pointer to variant data * return - @@ -188,29 +219,32 @@ /** * Set data for the Pac file query Dialog(s) + * * @param aEapInfo data to be filled * @param aMap Pointer to variant data * return - */ - void setFastPacFileQueryPwDialogDataL( + void SetFastPacFileQueryPwDialogDataL( TEapDialogInfo* aEapInfo, CHbSymbianVariantMap* aMap ); /** * Set data for the prov wait note Dialog(s) + * * @param aMap Pointer to variant data - * @param aAuthProvWaitNote Tells whether aut or unauth + * @param aAuthProvWaitNote Tells whether auth or unauth * return - */ - void setFastProvWaitNoteDialogDataL( + void SetFastProvWaitNoteDialogDataL( CHbSymbianVariantMap* aMap, TBool aAuthProvWaitNote ); /** * Set data for the Password Dialog(s) + * * @param aEapType Eap type to be used * @param aMap Pointer to variant data - * @param aAuthMethod Auth method to be used + * @param aAuthMethod Authentication method to be used * return - */ void SetPasswordQueryDataL( @@ -218,26 +252,38 @@ CHbSymbianVariantMap* aMap, const TDesC& aAuthMethod ); - private: + private: // Data - /** For callback */ + /** + * For callback + */ MNotificationCallback& iClient; - /** Pointer to the device dialog interface for handling the dialog */ + /** + * Pointer to the device dialog interface for handling the dialog + */ CHbDeviceDialogSymbian* iDialog; - /** The observer to handle the data received from the orbit dialog */ + + /** + * The observer to handle the data received from the orbit dialog + */ CEapAuthObserver* iObserver; - /* Information if request was already completed, in case the + /** + * Information if request was already completed, in case the * observer receives the data signal and the signal about closing the * dialog. */ TBool iCompleted; - /** Information if request was already cancelled.*/ + /** + * Information if request was already cancelled. + */ TBool iCancelled; - /** Pointer to the Eap Dialog Info structure */ + /** + * Pointer to the Eap Dialog Info structure + */ TEapDialogInfo* iEapInfo; diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_observer.h --- a/eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_observer.h Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_observer.h Wed Aug 18 09:50:56 2010 +0300 @@ -15,11 +15,29 @@ * */ +/* +* %version: 11 % +*/ + #ifndef __EAPAUTHOBSERVER_H__ #define __EAPAUTHOBSERVER_H__ +// System includes + +// User includes + +// Forward declarations class CEapAuthNotifier; +// External data types + +//Global function prototypes + +//Constants + +/** + * EAP Observer + */ NONSHARABLE_CLASS ( CEapAuthObserver ) : public CBase, public MHbDeviceDialogObserver { public: @@ -29,29 +47,35 @@ static CEapAuthObserver* NewL( CEapAuthNotifier* aNotifier ); - - /** - * Handles the setting of the notifier (dialog) type - * @param aType EEapNotifierType - */ - void SetNotifierType( CEapAuthNotifier::EEapNotifierType aType ); - + /** * Destructor */ ~CEapAuthObserver(); /** + * Handles the setting of the notifier (dialog) type + * + * @param aType EEapNotifierType + * return - + */ + void SetNotifierType( CEapAuthNotifier::EEapNotifierType aType ); + + /** * Handles the user input received from the dialog + * * @param aData CHbSymbianVariantMap& + * return - */ - void DataReceived(CHbSymbianVariantMap& aData); + void DataReceived( CHbSymbianVariantMap& aData ); /** * Handles the closing of the dialog + * * @param aCompletionCode TInt + * return - */ - void DeviceDialogClosed( TInt /*aCompletionCode*/ ); + void DeviceDialogClosed( TInt aCompletionCode ); private: /** * Constructor @@ -60,29 +84,38 @@ /** * Handles the user name password input received from the dialog + * * @param aData CHbSymbianVariantMap& + * return - */ void UsernamePasswordDlgDataReceived( CHbSymbianVariantMap& aData ); /** * Handles the password query user input received from the dialog + * * @param aData CHbSymbianVariantMap& + * return - */ void PwdQueryDataReceived( CHbSymbianVariantMap& aData ); /** * Handles the old password query user input received from the dialog + * * @param aData CHbSymbianVariantMap& + * return - */ void OldPwdQueryDataReceived( CHbSymbianVariantMap& aData ); - private: - /* Pointer to the object that triggered the dialog opening, + private: // Data + /** + * Pointer to the object that triggered the dialog opening, * needed to update the information about the user input. */ CEapAuthNotifier* iNotifier; - /* Current EAP notifier type to serve */ + /** + * Current EAP notifier type to serve + */ CEapAuthNotifier::EEapNotifierType iType; }; diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_ui_strings.h --- a/eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_ui_strings.h Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/eap_notifier/inc/eap_auth_ui_strings.h Wed Aug 18 09:50:56 2010 +0300 @@ -12,12 +12,12 @@ * Contributors: * * Description: - * EAP String definitions for the Notifier + * EAP String definitions * */ /* - * %version: 2 % + * %version: 3 % */ diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_notifier.cpp --- a/eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_notifier.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_notifier.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,23 +11,27 @@ * * Contributors: * -* Description: EAP Auth Notitier implementation +* Description: +* EAP Authentication Notitier implementation * */ /* -* %version: 3 % +* %version: 21 % */ -// INCLUDE FILES +// System include files #include #include -#include +#include +// User include files #include "eap_auth_notifier.h" #include "eap_auth_observer.h" #include "eap_auth_ui_strings.h" -// CONSTANTS +// External function prototypes + +// Local constants const TInt KVariableLength = 30; const TInt KDlgTypeStrLength = 100; const TInt KMaxAuthMethodLength = 50; @@ -53,9 +57,13 @@ _LIT(KTypenewpwddlg,"com.nokia.eap.mschapv2newpassworddialog/1.0"); _LIT(KTypeshowprovnotsuccdlg,"com.nokia.eap.fastshowprovnotsuccessnotedialog/1.0"); -// --------------------------------------------------------- -// CEapAuthNotifier::CEapAuthNotifier() -// --------------------------------------------------------- +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// Constructor +// --------------------------------------------------------------------------- // CEapAuthNotifier::CEapAuthNotifier( MNotificationCallback& aClient ) :iClient(aClient), @@ -68,9 +76,9 @@ } -// --------------------------------------------------------- -// CEapAuthNotifier::~CEapAuthNotifier() -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- // CEapAuthNotifier::~CEapAuthNotifier() { @@ -94,9 +102,9 @@ } } -// --------------------------------------------------------- -// CEapAuthNotifier* CEapAuthNotifier::NewL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Two-phased constructor +// --------------------------------------------------------------------------- // EXPORT_C CEapAuthNotifier* CEapAuthNotifier::NewL( MNotificationCallback& aClient ) @@ -111,9 +119,9 @@ return self; } -// --------------------------------------------------------- -// CEapAuthNotifier::ConstructL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// ConstructL for the Notifier +// --------------------------------------------------------------------------- // void CEapAuthNotifier::ConstructL() { @@ -123,9 +131,9 @@ iDialog = CHbDeviceDialogSymbian::NewL(); } -// --------------------------------------------------------- -// void CEapAuthNotifier::StartL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Start the Notifier +// --------------------------------------------------------------------------- // EXPORT_C void CEapAuthNotifier::StartL( EEapNotifierType aType, @@ -218,17 +226,17 @@ } else if ( aType == EEapNotifierTypeFastPacFilePwQueryDialog ) { - setFastPacFileQueryPwDialogDataL( aEapInfo, map ); + SetFastPacFileQueryPwDialogDataL( aEapInfo, map ); EapNtfType.Copy(KTypepacfilepwquerydlg); } else if ( aType == EEapNotifierTypeFastStartAuthProvWaitNote ) { - setFastProvWaitNoteDialogDataL( map, ETrue ); + SetFastProvWaitNoteDialogDataL( map, ETrue ); EapNtfType.Copy(KTypeprovwaitnotedlg); } else if ( aType == EEapNotifierTypeFastStartUnauthProvWaitNote ) { - setFastProvWaitNoteDialogDataL( map, EFalse ); + SetFastProvWaitNoteDialogDataL( map, EFalse ); EapNtfType.Copy(KTypeprovwaitnotedlg); } else if ( aType == EEapNotifierTypeMsChapV2PasswordExpiredNote ) @@ -259,11 +267,11 @@ RDebug::Print(_L("CEapAuthNotifier::StartL: LEAVING") ); } -// --------------------------------------------------------- -// void CEapAuthNotifier::setFastProvWaitNoteDialogDataL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Set data for the EAP-FAST provisioning wait note Dialog(s) +// --------------------------------------------------------------------------- // -void CEapAuthNotifier::setFastProvWaitNoteDialogDataL( +void CEapAuthNotifier::SetFastProvWaitNoteDialogDataL( CHbSymbianVariantMap* aMap, TBool aAuthProvWaitNote ) { @@ -272,23 +280,25 @@ CHbSymbianVariant *variant = NULL; - RDebug::Print(_L("CEapAuthNotifier::setFastProvWaitNoteDialogData: ENTERING")); + RDebug::Print(_L("CEapAuthNotifier::SetFastProvWaitNoteDialogDataL: ENTERING")); //Create the variant data information for the plugin - variant = CHbSymbianVariant::NewL ( &aAuthProvWaitNote, CHbSymbianVariant::EBool ); + variant = + CHbSymbianVariant::NewL ( + &aAuthProvWaitNote, CHbSymbianVariant::EBool ); CleanupStack::PushL( variant ); error = aMap->Add( key, variant); User::LeaveIfError( error ); CleanupStack::Pop( variant ); // map's cleanup sequence handles variant. - RDebug::Print(_L("CEapAuthNotifier::setFastProvWaitNoteDialogData: LEAVING") ); + RDebug::Print(_L("CEapAuthNotifier::SetFastProvWaitNoteDialogDataL: LEAVING") ); } -// --------------------------------------------------------- -// void CEapAuthNotifier::setFastPacFileQueryPwDialogDataL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Set data for the EAP-FAST PAC file query Dialog(s) +// --------------------------------------------------------------------------- // -void CEapAuthNotifier::setFastPacFileQueryPwDialogDataL( +void CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL( TEapDialogInfo* aEapInfo, CHbSymbianVariantMap* aMap ) { @@ -297,26 +307,28 @@ CHbSymbianVariant *variant = NULL; - RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: ENTERING")); + RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: ENTERING")); if( 0 < aEapInfo->iUidata.Length() ) { - RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: Set PAC filename")); - RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata ); + RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: Set PAC filename")); + RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata ); // Create the variant data information for the plugin - variant = CHbSymbianVariant::NewL ( &aEapInfo->iUidata, CHbSymbianVariant::EDes ); + variant = + CHbSymbianVariant::NewL ( + &aEapInfo->iUidata, CHbSymbianVariant::EDes ); CleanupStack::PushL( variant ); error = aMap->Add( key, variant); User::LeaveIfError( error ); CleanupStack::Pop( variant ); // map's cleanup sequence handles variant. } - RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: LEAVING") ); + RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: LEAVING") ); } -// -------------------------------------------------------------- -// void CEapAuthNotifier::SetFastInstallPacQueryDialogDataL -// -------------------------------------------------------------- +// --------------------------------------------------------------------------- +// Set data for the EAP-FAST Install PAC query Dialog(s) +// --------------------------------------------------------------------------- // void CEapAuthNotifier::SetFastInstallPacQueryDialogDataL( TEapDialogInfo* aEapInfo, @@ -335,7 +347,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata ); // Create the variant data information for the plugin - variant = CHbSymbianVariant::NewL ( &aEapInfo->iUidata, CHbSymbianVariant::EDes ); + variant = + CHbSymbianVariant::NewL ( + &aEapInfo->iUidata, CHbSymbianVariant::EDes ); CleanupStack::PushL( variant ); error = aMap->Add( key, variant); User::LeaveIfError( error ); @@ -344,9 +358,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: LEAVING") ); } -// --------------------------------------------------------- -// void CEapAuthNotifier::SetQueryDialogDataL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Set data for the Challenge Query Dialog(s) +// --------------------------------------------------------------------------- // void CEapAuthNotifier::SetQueryDialogDataL( TEapDialogInfo* aEapInfo, @@ -365,7 +379,8 @@ RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: aAuthMethod = %S\n"), &aAuthMethod ); // Create the variant data information for the plugin - variant = CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes ); + variant = + CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes ); CleanupStack::PushL( variant ); error = aMap->Add( key1, variant); User::LeaveIfError( error ); @@ -377,7 +392,9 @@ RDebug::Print(_L("CEapAuthObserver::SetQueryDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata ); // Create the variant data information for the plugin - variant = CHbSymbianVariant::NewL ( &aEapInfo->iUidata, CHbSymbianVariant::EDes ); + variant = + CHbSymbianVariant::NewL ( + &aEapInfo->iUidata, CHbSymbianVariant::EDes ); CleanupStack::PushL( variant ); error = aMap->Add( key2, variant); User::LeaveIfError( error ); @@ -386,9 +403,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: LEAVING") ); } -// --------------------------------------------------------- -// void CEapAuthNotifier::SetPasswordQueryDataL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Set data for the Password Query Dialog(s) +// --------------------------------------------------------------------------- // void CEapAuthNotifier::SetPasswordQueryDataL( TEapExpandedType& aEapType, @@ -405,14 +422,17 @@ //Create the variant data information for the plugin //Set authentication method - variant = CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes ); + variant = + CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes ); CleanupStack::PushL( variant ); error = aMap->Add( key2, variant); User::LeaveIfError( error ); CleanupStack::Pop( variant ); // map's cleanup sequence handles variant. //Set EAP type - variant = CHbSymbianVariant::NewL( &aEapType.GetValue(), CHbSymbianVariant::EBinary ); + variant = + CHbSymbianVariant::NewL( + &aEapType.GetValue(), CHbSymbianVariant::EBinary ); CleanupStack::PushL( variant ); error = aMap->Add( key3, variant); User::LeaveIfError( error ); @@ -420,9 +440,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetPasswordQueryData: LEAVING") ); } -// --------------------------------------------------------- -// void CEapAuthNotifier::SetUsernamePasswordDataL -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Set data for the UsernamePassword Dialog(s) +// --------------------------------------------------------------------------- // void CEapAuthNotifier::SetUsernamePasswordDataL( TEapDialogInfo* aEapInfo, @@ -441,7 +461,8 @@ //Create the variant data information for the plugin //Set authentication method - variant = CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes ); + variant = + CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes ); CleanupStack::PushL( variant ); error = aMap->Add( key2, variant); User::LeaveIfError( error ); @@ -454,7 +475,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: iEapInfo->iUsername = %S\n"), &iEapInfo->iUsername ); // Create the variant data information for the plugin - variant = CHbSymbianVariant::NewL ( &aEapInfo->iUsername, CHbSymbianVariant::EDes ); + variant = + CHbSymbianVariant::NewL ( + &aEapInfo->iUsername, CHbSymbianVariant::EDes ); CleanupStack::PushL( variant ); error = aMap->Add( key1, variant); User::LeaveIfError( error ); @@ -462,7 +485,9 @@ } //Set EAP type - variant = CHbSymbianVariant::NewL( &aEapType.GetValue(), CHbSymbianVariant::EBinary ); + variant = + CHbSymbianVariant::NewL( + &aEapType.GetValue(), CHbSymbianVariant::EBinary ); CleanupStack::PushL( variant ); error = aMap->Add( key3, variant); User::LeaveIfError( error ); @@ -470,9 +495,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: LEAVING") ); } -// -------------------------------------------------------------------------- -// void CEapAuthNotifier::SetSelectedUnameAndPwd( TEapDialogInfo& aEapInfo ) -// -------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// Sets the selected user name and password of the presented dialog +// --------------------------------------------------------------------------- // void CEapAuthNotifier::SetSelectedUnameAndPwd ( TEapDialogInfo& aEapInfo ) { @@ -493,9 +518,9 @@ } } -// ------------------------------------------------------------------------------ -// void CEapAuthNotifier::SetSelectedPassword( TEapDialogInfo& aPasswordInfo ) -// ------------------------------------------------------------------------------ +// --------------------------------------------------------------------------- +// Sets the selected password of the presented dialog +// --------------------------------------------------------------------------- // void CEapAuthNotifier::SetSelectedPassword ( TEapDialogInfo& aPasswordInfo ) { @@ -505,9 +530,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetSelectedPassword: iEapInfo->iPassword = %S\n"), &iEapInfo->iPassword ); } -// --------------------------------------------------------------------------------- -// void CEapAuthNotifier::SetSelectedOldPassword( TEapDialogInfo& aPasswordInfo ) -// --------------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// Sets the selected Old password of the presented dialog +// --------------------------------------------------------------------------- // void CEapAuthNotifier::SetSelectedOldPassword ( TEapDialogInfo& aPasswordInfo ) { @@ -517,9 +542,9 @@ RDebug::Print(_L("CEapAuthNotifier::SetSelectedOldPassword: iEapInfo->iOldPassword = %S\n"), &iEapInfo->iOldPassword ); } -// --------------------------------------------------------- -// void CEapAuthNotifier::Complete( TInt aStatus ) -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// The notifier is complete +// --------------------------------------------------------------------------- // void CEapAuthNotifier::CompleteL( TInt aStatus ) { @@ -532,9 +557,9 @@ } } -// ------------------------------------------------------------ -// void CEapAuthNotifier::Cancel() -// ------------------------------------------------------------ +// --------------------------------------------------------------------------- +// Cancel() the notifier +// --------------------------------------------------------------------------- // EXPORT_C void CEapAuthNotifier::Cancel() { diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_observer.cpp --- a/eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_observer.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_observer.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -15,15 +15,29 @@ * */ +/* +* %version: 15 % +*/ + +// System include files #include #include + +// User include files #include "eap_auth_notifier.h" #include "eap_auth_observer.h" +// External function prototypes -// --------------------------------------------------------- -// CEapAuthObserver* CEapAuthObserver::NewL -// --------------------------------------------------------- +// Local constants + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// Two-phased constructor. +// --------------------------------------------------------------------------- // CEapAuthObserver* CEapAuthObserver::NewL( CEapAuthNotifier* aNotifier ) @@ -34,9 +48,9 @@ return self; } -// --------------------------------------------------------- -// CEapAuthObserver::CEapAuthObserver -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Constructor +// --------------------------------------------------------------------------- // CEapAuthObserver::CEapAuthObserver( CEapAuthNotifier* aNotifier ): @@ -45,18 +59,18 @@ RDebug::Print(_L("CEapAuthObserver::CEapAuthObserver") ); } -// --------------------------------------------------------- -// CEapAuthObserver::~CEapAuthObserver() -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- // CEapAuthObserver::~CEapAuthObserver() { RDebug::Print(_L("CEapAuthObserver::~CEapAuthObserver") ); } -// --------------------------------------------------------- -// CEapAuthObserver::SetNotifierType -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Handles the setting of the notifier (dialog) type +// --------------------------------------------------------------------------- // void CEapAuthObserver::SetNotifierType( CEapAuthNotifier::EEapNotifierType aType ) { @@ -65,9 +79,11 @@ iType = aType; } -// --------------------------------------------------------- -// void CEapAuthObserver::DataReceived -// --------------------------------------------------------- +// Derived function: +// --------------------------------------------------------------------------- +// From class MHbDeviceDialogObserver. +// Handles the user input received from the dialog +// --------------------------------------------------------------------------- // void CEapAuthObserver::DataReceived( CHbSymbianVariantMap& aData ) { @@ -139,11 +155,12 @@ TRAP_IGNORE( iNotifier->CompleteL( status )); } -// --------------------------------------------------------- -// void CEapAuthObserver::UsernamePasswordDlgDataReceived -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Handles the user name password input received from the dialog +// --------------------------------------------------------------------------- // -void CEapAuthObserver::UsernamePasswordDlgDataReceived( CHbSymbianVariantMap& aData ) +void CEapAuthObserver::UsernamePasswordDlgDataReceived( + CHbSymbianVariantMap& aData ) { RDebug::Print(_L("CEapAuthObserver::UsernamePasswordDlgDataReceived") ); @@ -180,9 +197,9 @@ iNotifier->SetSelectedUnameAndPwd( PasswordInfo ); } -// --------------------------------------------------------- -// void CEapAuthObserver::OldPwdQueryDataReceived -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Handles the old password query user input received from the dialog +// --------------------------------------------------------------------------- // void CEapAuthObserver::OldPwdQueryDataReceived( CHbSymbianVariantMap& aData ) { @@ -207,9 +224,9 @@ iNotifier->SetSelectedOldPassword( PasswordInfo ); } -// --------------------------------------------------------- -// void CEapAuthObserver::PwdQueryDataReceived -// --------------------------------------------------------- +// --------------------------------------------------------------------------- +// Handles the password query user input received from the dialog +// --------------------------------------------------------------------------- // void CEapAuthObserver::PwdQueryDataReceived( CHbSymbianVariantMap& aData ) { @@ -234,9 +251,11 @@ iNotifier->SetSelectedPassword( PasswordInfo ); } -// --------------------------------------------------------- -// void CEapAuthObserver::DeviceDialogClosed -// --------------------------------------------------------- +// Derived function: +// --------------------------------------------------------------------------- +// From class MHbDeviceDialogObserver. +// Handles the closing of the dialog +// --------------------------------------------------------------------------- // void CEapAuthObserver::DeviceDialogClosed( TInt /*aCompletionCode*/ ) { diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/EapAkaInterface.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/EapAkaInterface.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/EapAkaInterface.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 15.1.2 % +* %version: 18 % */ // This is enumeration of EAPOL source code. diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/EapSimInterface.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/EapSimInterface.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/EapSimInterface.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 13.1.2 % +* %version: 16 % */ // This is enumeration of EAPOL source code. diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/eap_am_type_mschapv2_symbian.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/eap_am_type_mschapv2_symbian.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/eap_am_type_mschapv2_symbian.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 30.1.25 % +* %version: 34 % */ // This is enumeration of EAPOL source code. diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 30 % +* %version: 31 % */ // This is enumeration of EAPOL source code. @@ -329,6 +329,16 @@ iIndexType, iIndex, iTunnelingType); + + // Plain-MsChapv2 and EAP-MsChapv2 uses the same database. + // Here we set the correct authentication method to read settings. + error = CEapConversion::ConvertInternalTypeToExpandedEAPType( + &iEapType, + &aSettings.iEAPExpandedType); + if (error != KErrNone) + { + User::Leave(error); + } db.Close(); session.Close(); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2DbUtils.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2DbUtils.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2DbUtils.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 53 % +* %version: 56 % */ // This is enumeration of EAPOL source code. @@ -83,7 +83,7 @@ error = aDatabase.Open(aFileServerSession, aPrivateDatabasePathName); - EAP_TRACE_DEBUG_SYMBIAN((_L("EapMsChapV2DbUtils::OpenDatabaseL(): - Opened private DB for EAP-AKA. error=%d\n"), error)); + EAP_TRACE_DEBUG_SYMBIAN((_L("EapMsChapV2DbUtils::OpenDatabaseL(): - Opened private DB for EAP-MsChapV2. error=%d\n"), error)); User::LeaveIfError(error); @@ -406,7 +406,6 @@ { // Clear password from database. view.SetColL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_literal), KNullPasswordData); - view.PutL(); view.SetColNullL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_literal)); } @@ -704,7 +703,7 @@ error = aDatabase.Open(aFileServerSession, aPrivateDatabasePathName); - EAP_TRACE_DEBUG_SYMBIAN((_L("EapMsChapV2DbUtils::DeleteConfigurationL(): - Opened private DB for EAP-LEAP. error=%d\n"), error)); + EAP_TRACE_DEBUG_SYMBIAN((_L("EapMsChapV2DbUtils::DeleteConfigurationL(): - Opened private DB for EAP-MsChapV2. error=%d\n"), error)); User::LeaveIfError(error); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapGtcDbUtils.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapGtcDbUtils.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapGtcDbUtils.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 45 % +* %version: 47 % */ // This is enumeration of EAPOL source code. @@ -84,7 +84,7 @@ error = aDatabase.Open(aFileServerSession, aPrivateDatabasePathName); - EAP_TRACE_DEBUG_SYMBIAN((_L("EapGtcDbUtils::OpenDatabaseL(): - Opened private DB for EAP-AKA. error=%d\n"), error)); + EAP_TRACE_DEBUG_SYMBIAN((_L("EapGtcDbUtils::OpenDatabaseL(): - Opened private DB for EAP-GTC. error=%d\n"), error)); User::LeaveIfError(error); @@ -432,7 +432,6 @@ { // Clear password from database. view.SetColL(colSet->ColNo(cf_str_EAP_GTC_passcode_literal), KNullPasswordData); - view.PutL(); view.SetColNullL(colSet->ColNo(cf_str_EAP_GTC_passcode_literal)); } diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapSecurIDDbUtils.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapSecurIDDbUtils.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/securid/symbian/plugin/src/EapSecurIDDbUtils.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 28 % +* %version: 29 % */ // This is enumeration of EAPOL source code. @@ -82,7 +82,7 @@ error = aDatabase.Open(aFileServerSession, aPrivateDatabasePathName); - EAP_TRACE_DEBUG_SYMBIAN((_L("EapSecurIDDbUtils::OpenDatabaseL(): - Opened private DB for EAP-AKA. error=%d\n"), error)); + EAP_TRACE_DEBUG_SYMBIAN((_L("EapSecurIDDbUtils::OpenDatabaseL(): - Opened private DB for EAP-SecurID. error=%d\n"), error)); User::LeaveIfError(error); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/symbian/plugin/include/EapPluginDbDefaults.h --- a/eapol/eapol_framework/eapol_symbian/am/type/symbian/plugin/include/EapPluginDbDefaults.h Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/symbian/plugin/include/EapPluginDbDefaults.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 6 % +* %version: 7 % */ #if !defined(_EAPPLUGINDBDEFAULTS_H_) diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/eap_am_type_tls_peap_symbian.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/eap_am_type_tls_peap_symbian.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/eap_am_type_tls_peap_symbian.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 247.2.68 % +* %version: 256 % */ // This is enumeration of EAPOL source code. @@ -249,7 +249,7 @@ m_db_cipher_suite_table_name = KPeapAllowedCipherSuitesDatabaseTableName; m_db_name = KPeapDatabaseName; } - else if (m_current_eap_type == eap_type_ttls_plain_pap + else if (m_current_eap_type == eap_expanded_type_ttls_plain_pap.get_type() || m_current_eap_type == eap_type_ttls) { m_db_table_name = KTtlsDatabaseTableName; @@ -320,7 +320,7 @@ && aEapType != eap_type_ttls #endif // #if defined(USE_TTLS_EAP_TYPE) - && aEapType != eap_type_ttls_plain_pap + && aEapType != eap_expanded_type_ttls_plain_pap.get_type() #if defined (USE_FAST_EAP_TYPE) && aEapType != eap_type_fast @@ -1771,7 +1771,7 @@ cf_str_EAP_TTLS_max_session_validity_time.get_field(), &sessionTimeFromFile); } - else if (m_current_eap_type == eap_type_ttls_plain_pap) + else if (m_current_eap_type == eap_expanded_type_ttls_plain_pap.get_type()) { // read PAP session time status = type_configure_read( @@ -3360,7 +3360,7 @@ || m_current_eap_type == eap_type_fast #endif - || m_current_eap_type == eap_type_ttls_plain_pap + || m_current_eap_type == eap_expanded_type_ttls_plain_pap.get_type() ) { @@ -5317,7 +5317,7 @@ return; } - TInt error = m_allowed_user_certs.Append(entry->Copy()); + TInt error = m_allowed_user_certs.Append(entry); if (error != KErrNone) { EAP_TRACE_DEBUG( @@ -5335,6 +5335,8 @@ 0, false, 0); + + delete entry; EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT); return; @@ -6814,7 +6816,7 @@ lastFullAuthTimeString.Set(KFASTLastFullAuthTime); } #endif - else if (m_current_eap_type == eap_type_ttls_plain_pap) + else if (m_current_eap_type == eap_expanded_type_ttls_plain_pap.get_type()) { // we should not come here, ttls pap has its own // method for checking session validity @@ -6986,7 +6988,7 @@ { lastFullAuthTimeString.Set(KTTLSLastFullAuthTime); } - else if (m_current_eap_type == eap_type_ttls_plain_pap) + else if (m_current_eap_type == eap_expanded_type_ttls_plain_pap.get_type()) { lastFullAuthTimeString.Set( KTTLSPAPLastFullAuthTime ); } diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeap.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeap.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeap.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 64 % +* %version: 67 % */ // This is enumeration of EAPOL source code. @@ -91,9 +91,6 @@ return; } - ASSERT(iEapType.get_vendor_id() == eap_type_vendor_id_ietf); - ASSERT(iTunnelingType.get_vendor_id() == eap_type_vendor_id_ietf); - #if defined(USE_FAST_EAP_TYPE) if(iEapType == eap_type_fast) { @@ -202,7 +199,7 @@ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapTlsPeap::NewTtlsPapL()\n")); return new (ELeave) CEapTlsPeap( - aIapInfo->indexType, aIapInfo->index, eap_type_ttls_plain_pap ); + aIapInfo->indexType, aIapInfo->index, eap_expanded_type_ttls_plain_pap.get_type() ); } @@ -672,7 +669,7 @@ || iEapType == eap_type_fast #endif - || iEapType == eap_type_ttls_plain_pap + || iEapType == eap_expanded_type_ttls_plain_pap.get_type() ) @@ -689,7 +686,7 @@ || (iEapType == eap_type_fast && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) #endif - || (iEapType == eap_type_ttls_plain_pap && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) + || (iEapType == eap_expanded_type_ttls_plain_pap.get_type() && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) ) @@ -889,7 +886,7 @@ ciphersuites.Set(KFastAllowedCipherSuitesDatabaseTableName); } #endif - else if (iEapType == eap_type_ttls_plain_pap) + else if (iEapType == eap_expanded_type_ttls_plain_pap.get_type()) { settings.Set(KTtlsDatabaseTableName); usercerts.Set(KTtlsAllowedUserCertsDatabaseTableName); @@ -997,7 +994,7 @@ || iEapType == eap_type_fast #endif - || iEapType == eap_type_ttls_plain_pap + || iEapType == eap_expanded_type_ttls_plain_pap.get_type() ) @@ -1014,7 +1011,7 @@ || (iEapType == eap_type_fast && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) #endif - || (iEapType == eap_type_ttls_plain_pap && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) + || (iEapType == eap_expanded_type_ttls_plain_pap.get_type() && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) ) @@ -1210,7 +1207,7 @@ ciphersuites.Set(KTtlsAllowedCipherSuitesDatabaseTableName); } #endif - else if (iEapType == eap_type_ttls_plain_pap) + else if (iEapType == eap_expanded_type_ttls_plain_pap.get_type()) { settings.Set(KTtlsDatabaseTableName); usercerts.Set(KTtlsAllowedUserCertsDatabaseTableName); @@ -1330,7 +1327,7 @@ || iEapType == eap_type_fast #endif - || iEapType == eap_type_ttls_plain_pap + || iEapType == eap_expanded_type_ttls_plain_pap.get_type() ) @@ -1350,7 +1347,7 @@ || (iEapType == eap_type_fast && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) #endif - || (iEapType == eap_type_ttls_plain_pap && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) + || (iEapType == eap_expanded_type_ttls_plain_pap.get_type() && !CEapTypePlugin::IsDisallowedInsidePEAP(*iEapArray[i])) ) { diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeapUtils.cpp --- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeapUtils.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeapUtils.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 137 % +* %version: 140 % */ // This is enumeration of EAPOL source code. @@ -94,7 +94,7 @@ OpenFastDatabaseL(aDatabase, aFileServerSession, aIndexType, aIndex, aTunnelingType); } #endif // #if defined(USE_FAST_EAP_TYPE) - else if ( aEapType == eap_type_ttls_plain_pap ) + else if ( aEapType == eap_expanded_type_ttls_plain_pap.get_type() ) { OpenTtlsDatabaseL( aDatabase, aFileServerSession, aIndexType, aIndex, aTunnelingType); } @@ -2121,14 +2121,21 @@ TPtrC8 ptr2 = view.ColDes8(colSet->ColNo(KSubjectKeyIdentifier)); // This is for authentication and uses Symbian subjectkey id. certInfo->SetSubjectKeyId(ptr2); - aArray.Append(certInfo); - - EAP_TRACE_DEBUG_SYMBIAN((_L("ReadCertRowsToArrayL - Appended Cert with label=%S\n"), - certInfo->GetLabel())); - + TInt error = aArray.Append(certInfo); + + EAP_TRACE_DEBUG_SYMBIAN((_L("ReadCertRowsToArrayL - Appended Cert with label=%S, error=%d\n"), + certInfo->GetLabel(), + error)); + EAP_TRACE_DATA_DEBUG_SYMBIAN(("ReadCertRowsToArrayL - Appended Cert's SubjectKeyID:", certInfo->GetSubjectKeyId().Ptr(), certInfo->GetSubjectKeyId().Length())); + + if (error != KErrNone) + { + delete certInfo; + User::Leave(error); + } } } while (view.NextL() != EFalse); @@ -2197,12 +2204,17 @@ { // Store the line TUint tmp = view.ColUint(KDefaultColumnInView_One); - aArray.Append(tmp); + TInt error = aArray.Append(tmp); EAP_TRACE_DEBUG_SYMBIAN( - (_L("EapTlsPeapUtils::ReadUintRowsToArrayL(): TUint=%d\n"), - tmp)); - + (_L("EapTlsPeapUtils::ReadUintRowsToArrayL(): TUint=%d, error=%d\n"), + tmp, + error)); + + if (error != KErrNone) + { + User::Leave(error); + } } break; default: @@ -2366,7 +2378,7 @@ } #endif - else if ( aEapType == eap_type_ttls_plain_pap ) + else if ( aEapType == eap_expanded_type_ttls_plain_pap.get_type() ) { sqlStatement.Format(KSQLQueryRow, &cf_str_PEAP_accepted_tunneled_client_types_hex_data_literal, @@ -2391,7 +2403,7 @@ // Unsupported EAP type User::Leave(KErrNotSupported); } - + RDbView view; User::LeaveIfError(view.Prepare(aDatabase, TDbQuery(sqlStatement), TDbWindow::EUnlimited)); CleanupClosePushL(view); @@ -2401,7 +2413,7 @@ TInt enabledEAPCount = aEnabledEAPArrary.Count(); TInt disabledEAPCount = aDisabledEAPArrary.Count(); - + HBufC8 *acceptedDbText = HBufC8::NewLC( KEapExpandedTypeLength * enabledEAPCount ); // 8 bytes (64 bits) for an EAP type. HBufC8 *unacceptedDbText = HBufC8::NewLC( KEapExpandedTypeLength * disabledEAPCount ); // 8 bytes (64 bits) for an EAP type. @@ -2545,7 +2557,7 @@ } #endif - else if (aEapType == eap_type_ttls_plain_pap ) + else if (aEapType == eap_expanded_type_ttls_plain_pap.get_type() ) { sqlStatement.Format(KSQLQueryRow, &cf_str_PEAP_accepted_tunneled_client_types_hex_data_literal, @@ -2625,7 +2637,7 @@ expandedEAPTmp->GetVendorId(), expandedEAPTmp->GetVendorType())); - aEnabledEAPArrary.Append(expandedEAPTmp); + aEnabledEAPArrary.AppendL(expandedEAPTmp); index = index + KEapExpandedTypeLength; } @@ -2650,7 +2662,7 @@ expandedEAPTmp->GetVendorId(), expandedEAPTmp->GetVendorType())); - aDisabledEAPArrary.Append(expandedEAPTmp); + aDisabledEAPArrary.AppendL(expandedEAPTmp); index = index + KEapExpandedTypeLength; } @@ -2848,7 +2860,7 @@ lastFullAuthTime.Set(KFASTLastFullAuthTime); } #endif - else if (aEapType == eap_type_ttls_plain_pap) + else if (aEapType == eap_expanded_type_ttls_plain_pap.get_type()) { settings.Set( KTtlsDatabaseTableName ); maxSessionTime.Set( cf_str_EAP_TLS_PEAP_ttls_pap_max_session_validity_time_literal ); @@ -2905,7 +2917,7 @@ ////////////////////////////////////////// // This is only for plain PAP settings. // ////////////////////////////////////////// - if ( aEapType == eap_type_ttls_plain_pap ) + if ( aEapType == eap_expanded_type_ttls_plain_pap.get_type() ) { // Username if ( aSettings.iUsernamePresent ) @@ -2935,7 +2947,6 @@ { // Clear password from database. view.SetColL(colSet->ColNo(cf_str_EAP_TLS_PEAP_ttls_pap_password_literal), KNullPasswordData); - view.PutL(); view.SetColNullL(colSet->ColNo(cf_str_EAP_TLS_PEAP_ttls_pap_password_literal)); } @@ -3013,7 +3024,7 @@ EAP_TRACE_DEBUG_SYMBIAN((_L("EapTlsPeapUtils::SetConfigurationL(): Return PAP\n") ) ); return; - } // if ( aEapVendorType == eap_type_ttls_plain_pap ) + } // if ( aEapVendorType == eap_expanded_type_ttls_plain_pap.get_type() ) if (aSettings.iUseAutomaticCACertificatePresent) @@ -3822,7 +3833,7 @@ maxSessionTime.Set(cf_str_EAP_FAST_max_session_validity_time_literal); } #endif - else if (aEapType == eap_type_ttls_plain_pap) + else if (aEapType == eap_expanded_type_ttls_plain_pap.get_type()) { settings.Set( KTtlsDatabaseTableName ); maxSessionTime.Set( cf_str_EAP_TLS_PEAP_ttls_pap_max_session_validity_time_literal ); @@ -3881,7 +3892,7 @@ ////////////////////////////////////////// // This is only for plain PAP settings. // ////////////////////////////////////////// - if ( aEapType == eap_type_ttls_plain_pap ) + if ( aEapType == eap_expanded_type_ttls_plain_pap.get_type() ) { // Username TPtrC username = view.ColDes( colSet->ColNo( @@ -4234,7 +4245,7 @@ do { view.GetL(); { - aSettings.iCipherSuites.Append(view.ColUint(colSet->ColNo(KCipherSuite))); + aSettings.iCipherSuites.AppendL(view.ColUint(colSet->ColNo(KCipherSuite))); } } while (view.NextL() != EFalse); } @@ -4877,7 +4888,7 @@ ciphersuites.Set(KFastAllowedCipherSuitesDatabaseTableName); } #endif - else if (aEapType == eap_type_ttls_plain_pap) + else if (aEapType == eap_expanded_type_ttls_plain_pap.get_type()) { dbname.Set( KTtlsDatabaseName ); settings.Set( KTtlsDatabaseTableName ); @@ -4974,7 +4985,7 @@ ////////////////////////////////////////// // This is only for plain PAP settings. // ////////////////////////////////////////// - if ( aEapType == eap_type_ttls_plain_pap ) + if ( aEapType == eap_expanded_type_ttls_plain_pap.get_type() ) { CleanupStack::PopAndDestroy(buf); CleanupStack::PopAndDestroy(&aDatabase); @@ -5278,7 +5289,7 @@ generalSettingsTableName = KPeapDatabaseTableName; } else if (aEapType == eap_type_ttls - || aEapType == eap_type_ttls_plain_pap) + || aEapType == eap_expanded_type_ttls_plain_pap.get_type()) { generalSettingsTableName = KTtlsDatabaseTableName; } @@ -5551,7 +5562,7 @@ generalSettingsTableName = KPeapDatabaseTableName; } else if (aEapType == eap_type_ttls - || aEapType == eap_type_ttls_plain_pap) + || aEapType == eap_expanded_type_ttls_plain_pap.get_type()) { generalSettingsTableName = KTtlsDatabaseTableName; } diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/eap_server/src/EapServerProcessHandler.cpp --- a/eapol/eapol_framework/eapol_symbian/eap_server/src/EapServerProcessHandler.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/eap_server/src/EapServerProcessHandler.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 40 % +* %version: 41 % */ #include "EapServerProcessHandler.h" @@ -152,7 +152,7 @@ EAP_TRACE_DATA_DEBUG( iTools, - TRACE_FLAGS_DEFAULT, + EAP_TRACE_FLAGS_NEVER, (EAPL("CEapServerProcessHandler::SaveMessage()"), data, length)); diff -r fe6b6762fccd -r 53085837e73a eapol/eapol_framework/eapol_symbian/eap_server/src/EapSession.cpp --- a/eapol/eapol_framework/eapol_symbian/eap_server/src/EapSession.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/eap_server/src/EapSession.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 31 % +* %version: 32 % */ @@ -264,7 +264,7 @@ EAP_TRACE_DATA_DEBUG( iTools, - TRACE_FLAGS_DEFAULT, + EAP_TRACE_FLAGS_NEVER, (EAPL("CEapSession::ServiceL()"), aData, aLength)); diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapdialogplugin.h --- a/securitysettings/eapqtdialogs/inc/eapdialogplugin.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapdialogplugin.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,15 +16,30 @@ */ /* -* %version: 3 % +* %version: 4 % */ #ifndef ____EAPDIALOG_H__PLUGIN_H__ #define ____EAPDIALOG_H__PLUGIN_H__ +// System includes #include #include +// User includes + +// Forward declarations + +// External data types + +// Constants + +/*! + @addtogroup group_eap_dialog_plugin + @{ + */ + +// Class declaration class EapDialogPlugin : public HbDeviceDialogPlugin { @@ -37,27 +52,29 @@ /* Destructor */ ~EapDialogPlugin(); - /* Check whether access is allowed, true is always returned */ + /* Check whether access is allowed, true is always returned. + (from HbDeviceDialogPlugin) */ bool accessAllowed(const QString &deviceDialogType, const QVariantMap ¶meters, const QVariantMap &securityInfo) const; - /* Creates the dialog widget */ + /* Creates the dialog widget. (from HbDeviceDialogPluginInterface) */ HbDeviceDialogInterface *createDeviceDialog(const QString &deviceDialogType, const QVariantMap ¶meters); - /* Returns the device dialog type */ + /* Returns the device dialog type. (from HbDeviceDialogPlugin)*/ bool deviceDialogInfo(const QString &deviceDialogType, const QVariantMap ¶meters, DeviceDialogInfo *info) const; /* Returns a list of dialog types that this plugin implements. - * Only one dialog type is supported. + * Only one dialog type is supported. (from HbDeviceDialogPlugin) */ QStringList deviceDialogTypes() const; - /* Returns the possible plugin flags, there are none */ + /* Returns the possible plugin flags, there are none. + (from HbDeviceDialogPlugin) */ PluginFlags pluginFlags() const; - /* Not supported */ + /* Not supported. (from HbDeviceDialogPlugin)*/ int error() const; private: @@ -65,4 +82,6 @@ }; +/*! @} */ + #endif // ___EAPDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapfastcreatemasterkeyquerydialog.h --- a/securitysettings/eapqtdialogs/inc/eapfastcreatemasterkeyquerydialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapfastcreatemasterkeyquerydialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -11,25 +11,39 @@ * * Contributors: * -* Description: Fast Create Master Key Query Dialog +* Description: EAP-FAST Create Master Key Query Dialog * */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPFASTCREATEMASTERKEYQUERYDIALOG_H__ #define __EAPFASTCREATEMASTERKEYQUERYDIALOG_H__ - +// System includes #include #include +// User includes + +// Forward declarations class HbLineEdit; class HbTranslator; class EapQtValidator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_fast_create_master_key_query_dialog + @{ + */ + +// Class declaration + class EapFastCreateMasterKeyQueryDialog: public HbInputDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -44,17 +58,18 @@ void createDialog( const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -80,29 +95,32 @@ Q_DISABLE_COPY(EapFastCreateMasterKeyQueryDialog) - private: - /* Pointer to the line edit 1 object */ + private: // data + // NOT OWNED + //! Pointer to the line edit 1 object HbLineEdit *mEdit1; - /* Pointer to the line edit 2 object */ + //! Pointer to the line edit 2 object HbLineEdit *mEdit2; - - /* Pointer to the password validator object */ + + // OWNED + //! Pointer to the password validator object QScopedPointer mPwdValidator; - /* Pointer to the HbTranslator */ + //! Pointer to the HbTranslator QScopedPointer mTranslator; - /* Pointer to the error message HbTranslator */ + //! Pointer to the error message HbTranslator QScopedPointer mErrMsgTranslator; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog bool mClose; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; }; +/*! @} */ #endif // __EAPFASTCREATEMASTERKEYQUERYDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapfastinstallpacquerydialog.h --- a/securitysettings/eapqtdialogs/inc/eapfastinstallpacquerydialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapfastinstallpacquerydialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,18 +16,32 @@ */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPFASTINSTALLQUERYDIALOG_H__ #define __EAPFASTINSTALLQUERYDIALOG_H__ - +// System includes #include #include +// User includes + +// Forward declarations class HbTranslator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_fast_install_pac_query_dialog + @{ + */ + +// Class declaration + class EapFastInstallPacQueryDialog: public HbMessageBox, public HbDeviceDialogInterface { Q_OBJECT @@ -42,17 +56,18 @@ void createDialog(const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -76,16 +91,20 @@ Q_DISABLE_COPY(EapFastInstallPacQueryDialog) - private: + private: // data + // NOT OWNED - /* Pointer to the HbTranslator */ + // OWNED + //! Pointer to the password validator object QScopedPointer mTranslator; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog bool mClose; - /* Tells whether Yes Action has already been pressed */ + //! Tells whether Yes Action has already been pressed bool mYesActionPressed; }; +/*! @} */ + #endif // __EAPFASTINSTALLQUERYDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapfastpacfilepwquerydialog.h --- a/securitysettings/eapqtdialogs/inc/eapfastpacfilepwquerydialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapfastpacfilepwquerydialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -11,24 +11,37 @@ * * Contributors: * -* Description: Fast Pac File Password Query Dialog +* Description: EAP-FAST PAC File Password Query Dialog * */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPFASTPACFILEPWQUERYDIALOG_H__ #define __EAPFASTPACFILEPWQUERYDIALOG_H__ - +// System includes #include #include +// User includes +// Forward declarations class HbTranslator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_fast_pac_file_pwd_query_dialog + @{ + */ + +// Class declaration + class EapFastPacFilePwQueryDialog: public HbInputDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -43,17 +56,18 @@ void createDialog( const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -77,20 +91,23 @@ Q_DISABLE_COPY(EapFastPacFilePwQueryDialog) - private: - /* Pointer to the line edit object */ + private: // data + // NOT OWNED + //! Pointer to the line edit object HbLineEdit *mEdit; - /* Pointer to the HbTranslator */ + // OWNED + //! Pointer to the password validator object QScopedPointer mTranslator; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog bool mClose; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; }; +/*! @} */ #endif // __EAPFASTPACFILEPWQUERYDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapfastpacstorepwquerydialog.h --- a/securitysettings/eapqtdialogs/inc/eapfastpacstorepwquerydialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapfastpacstorepwquerydialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -11,23 +11,38 @@ * * Contributors: * -* Description: Fast Pac Store Password Query Dialog +* Description: EAP-FAST PAC Store Password Query Dialog * */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPFASTPACSTOREPWQUERYDIALOG_H__ #define __EAPFASTPACSTOREPWQUERYDIALOG_H__ +// System includes #include #include +// User includes + +// Forward declarations class HbTranslator; class EapQtValidator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_fast_pac_store_pwd_query_dialog + @{ + */ + +// Class declaration + class EapFastPacStorePwQueryDialog: public HbInputDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -38,21 +53,22 @@ /* Destructor */ ~EapFastPacStorePwQueryDialog(); - /* Function creates the actual dialog widget */ - void createDialog( const QVariantMap ¶meters ); + /* Function creates the actual dialog widget. */ + void createDialog(); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface)*/ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -78,24 +94,27 @@ Q_DISABLE_COPY(EapFastPacStorePwQueryDialog) - private: - /* Pointer to the line edit object */ + private: // data + // NOT OWNED + //! Pointer to the line edit object HbLineEdit *mEdit; - /* Pointer to the password validator object */ + // OWNED + //! Pointer to the password validator object QScopedPointer mPwdValidator; - /* Pointer to the HbTranslator */ + //! Pointer to the HbTranslator QScopedPointer mTranslator; - /* Pointer to the error message HbTranslator */ + //! Pointer to the error message HbTranslator QScopedPointer mErrMsgTranslator; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog bool mClose; }; +/*! @} */ #endif // __EAPFASTPACSTOREPWQUERYDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapfastprovnotsuccessnotedialog.h --- a/securitysettings/eapqtdialogs/inc/eapfastprovnotsuccessnotedialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapfastprovnotsuccessnotedialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -11,23 +11,39 @@ * * Contributors: * -* Description: Fast Provisioning not successfull note Dialog +* Description: +* EAP-FAST Provisioning not successfull note Dialog * */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPFASTPROVNOTSUCCESSNOTEDIALOG_H__ #define __EAPFASTPROVNOTSUCCESSNOTEDIALOG_H__ +// System includes #include #include +// User includes + +// Forward declarations class HbAction; class HbTranslator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_fast_prov_not_success_note_dialog + @{ + */ + +// Class declaration + class EapFastProvNotSuccessNoteDialog: public HbMessageBox, public HbDeviceDialogInterface { Q_OBJECT @@ -39,20 +55,21 @@ ~EapFastProvNotSuccessNoteDialog(); /* Function creates the actual dialog widget */ - void createDialog(const QVariantMap ¶meters ); + void createDialog(); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -73,13 +90,17 @@ Q_DISABLE_COPY(EapFastProvNotSuccessNoteDialog) - private: + private: // data + // NOT OWNED - /* Pointer to the HbTranslator */ + // OWNED + //! Pointer to the HbTranslator QScopedPointer mTranslator; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; }; +/*! @} */ + #endif // __EAPFASTPROVNOTSUCCESSNOTEDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapfastprovwaitnotedialog.h --- a/securitysettings/eapqtdialogs/inc/eapfastprovwaitnotedialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapfastprovwaitnotedialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,17 +16,32 @@ */ /* -* %version: 2 % +* %version: 3 % */ #ifndef __EAPFASTPROVWAITNOTEDIALOG_H__ #define __EAPFASTPROVWAITNOTEDIALOG_H__ +// System includes #include #include +// User includes + +// Forward declarations class HbTranslator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_fast_prov_wait_note_dialog + @{ + */ + +// Class declaration + class EapFastProvWaitNoteDialog: public HbNotificationDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -42,17 +57,18 @@ void createDialog(const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -71,9 +87,15 @@ Q_DISABLE_COPY(EapFastProvWaitNoteDialog) - /* Pointer to the HbTranslator */ + private:// data + // NOT OWNED + + // OWNED + //! Pointer to the HbTranslator QScopedPointer mTranslator; }; + +/*! @} */ #endif // __EAPFASTPROVWAITNOTEDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapmschapv2newpwddialog.h --- a/securitysettings/eapqtdialogs/inc/eapmschapv2newpwddialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapmschapv2newpwddialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,20 +16,35 @@ */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPMSCHAPV2NEWPWDDIALOG_H__ #define __EAPMSCHAPV2NEWPWDDIALOG_H__ +// System includes #include #include +// User includes + +// Forward declarations class EapQtValidator; class HbTranslator; class HbLineEdit; class HbAction; +// External data types + +// Constants + +/*! + @addtogroup group_eap_mschapv2_new_pwd_dialog + @{ + */ + +// Class declaration + class EapMschapv2NewPwdDialog: public HbInputDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -44,17 +59,18 @@ void createDialog( const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. + * (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface)*/ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface)*/ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. (from HbDeviceDialogInterface)*/ HbPopup *deviceDialogWidget() const; signals: @@ -80,27 +96,30 @@ Q_DISABLE_COPY(EapMschapv2NewPwdDialog) - private: - /* Pointer to the line edit 1 object */ + private: // data + // NOT OWNED + //! Pointer to the line edit 1 object HbLineEdit *mEdit1; - /* Pointer to the line edit 2 object */ + //! Pointer to the line edit 2 object HbLineEdit *mEdit2; - - /* Pointer to the password validator object */ + + // OWNED + //! Pointer to the password validator object QScopedPointer mPwdValidator; - /* Pointer to the main HbTranslator */ + //! Pointer to the main HbTranslator QScopedPointer mTranslator; - /* Pointer to the error message HbTranslator */ + //! Pointer to the error message HbTranslator QScopedPointer mErrMsgTranslator; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog bool mClose; }; +/*! @} */ #endif // __EAPMSCHAPV2NEWPWDDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapmschapv2oldpwddialog.h --- a/securitysettings/eapqtdialogs/inc/eapmschapv2oldpwddialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapmschapv2oldpwddialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,18 +16,33 @@ */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPMSCHAPV2OLDPWDDIALOG_H__ #define __EAPMSCHAPV2OLDPWDDIALOG_H__ +// System includes #include #include +// User includes + +// Forward declarations class HbTranslator; class EapQtValidator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_mschapv2_old_pwd_dialog + @{ + */ + +// Class declaration + class EapMschapv2OldPwdDialog: public HbInputDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -44,16 +59,18 @@ /* Device dialog parameters to be set while dialog is displayed. * Not supported. + * (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -79,23 +96,26 @@ Q_DISABLE_COPY(EapMschapv2OldPwdDialog) - private: - /* Pointer to the line edit object */ + private: // data + // NOT OWNED + //! Pointer to the line edit object HbLineEdit *mEdit; - - /* Pointer to the password validator object */ + + // OWNED + //! Pointer to the password validator object QScopedPointer mPwdValidator; - /* Pointer to the HbTranslator */ + //! Pointer to the HbTranslator QScopedPointer mTranslator; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog bool mClose; }; +/*! @} */ #endif // __EAPMSCHAPV2OLDPWDDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapmschapv2pwdexpirednotedialog.h --- a/securitysettings/eapqtdialogs/inc/eapmschapv2pwdexpirednotedialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapmschapv2pwdexpirednotedialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,18 +16,33 @@ */ /* -* %version: 2 % +* %version: 3 % */ #ifndef __EAPMSCHAPV2PWDEXPNOTEDIALOG_H__ #define __EAPMSCHAPV2PWDEXPNOTEDIALOG_H__ - +// System includes #include #include +// User includes + +// Forward declarations + class HbTranslator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_mschapv2_pwd_exp_note_dialog + @{ + */ + +// Class declaration + class EapMschapv2PwdExpNoteDialog: public HbMessageBox, public HbDeviceDialogInterface { Q_OBJECT @@ -39,20 +54,21 @@ ~EapMschapv2PwdExpNoteDialog(); /* Function creates the actual dialog widget */ - void createDialog(const QVariantMap ¶meters ); + void createDialog(); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -73,13 +89,17 @@ Q_DISABLE_COPY(EapMschapv2PwdExpNoteDialog) - private: + private: // data + // NOT OWNED - /* Pointer to the HbTranslator */ + // OWNED + //! Pointer to the HbTranslator QScopedPointer mTranslator; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; }; + +/*! @} */ #endif // __EAPMSCHAPV2PWDEXPNOTEDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eappasswordquerydialog.h --- a/securitysettings/eapqtdialogs/inc/eappasswordquerydialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eappasswordquerydialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -16,20 +16,35 @@ */ /* -* %version: 3 % +* %version: 4 % */ #ifndef __EAPPASSWORDQUERYDIALOG_H__ #define __EAPPASSWORDQUERYDIALOG_H__ +// System includes #include #include +// User includes + +// Forward declarations class HbTranslator; class HbLineEdit; class EapQtValidator; +// External data types + +// Constants + +/*! + @addtogroup group_eap_password_query_dialog + @{ + */ + +// Class declaration + class EapPasswordQueryDialog: public HbInputDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -44,17 +59,18 @@ void createDialog( const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface)*/ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface)*/ HbPopup *deviceDialogWidget() const; signals: @@ -80,23 +96,26 @@ Q_DISABLE_COPY(EapPasswordQueryDialog) - private: - /* Pointer to the line edit 1 object */ + private: //data + // NOT OWNED + //! Pointer to the line edit 1 object HbLineEdit *mEdit; - - /* Pointer to the password validator object */ + + // OWNED + //! Pointer to the password validator object QScopedPointer mPwdValidator; - /* Pointer to the main HbTranslator */ + //! Pointer to the main HbTranslator QScopedPointer mTranslator; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog */ bool mClose; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; }; +/*! @} */ #endif // __EAPPASSWORDQUERYDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapquerydialog.h --- a/securitysettings/eapqtdialogs/inc/eapquerydialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapquerydialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -11,24 +11,38 @@ * * Contributors: * -* Description: EAP query Dialog +* Description: EAP Challenge query Dialog * */ /* - * %version: 2 % + * %version: 3 % */ #ifndef __EAPQUERYDIALOG_H__ #define __EAPQUERYDIALOG_H__ - +// System includes #include #include +// User includes + +// Forward declarations class HbTranslator; class EapQtValidator; +// External data types + +// Constants + +/*! + @addtogroup group_query_dialog + @{ + */ + +// Class declaration + class EapQueryDialog: public HbMessageBox, public HbDeviceDialogInterface { Q_OBJECT @@ -43,17 +57,18 @@ void createDialog(const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -74,13 +89,17 @@ Q_DISABLE_COPY(EapQueryDialog) - private: + private: // data + // NOT OWNED - /* Pointer to the HbTranslator */ + // OWNED + //! Pointer to the HbTranslator QScopedPointer mTranslator; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; }; + +/*! @} */ #endif // __EAPQUERYDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/inc/eapusernamepwddialog.h --- a/securitysettings/eapqtdialogs/inc/eapusernamepwddialog.h Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/inc/eapusernamepwddialog.h Wed Aug 18 09:50:56 2010 +0300 @@ -15,20 +15,35 @@ */ /* - * %version: 3 % + * %version: 4 % */ #ifndef __EAPUSERNAMEPWDDIALOG_H__ #define __EAPUSERNAMEPWDDIALOG_H__ +// System includes #include #include +// User includes + +// Forward declarations class EapQtValidator; class HbTranslator; class HbLineEdit; class HbAction; +// External data types + +// Constants + +/*! + @addtogroup group_eap_username_pwd_dialog + @{ + */ + +// Class declaration + class EapUsernamePwdDialog: public HbInputDialog, public HbDeviceDialogInterface { Q_OBJECT @@ -43,17 +58,18 @@ void createDialog( const QVariantMap ¶meters ); /* Device dialog parameters to be set while dialog is displayed. - * Not supported. + * Not supported. (from HbDeviceDialogInterface) */ bool setDeviceDialogParameters(const QVariantMap ¶meters); - /* Not supported */ + /* Not supported. (from HbDeviceDialogInterface) */ int deviceDialogError() const; - /* Closes the device dialog */ + /* Closes the device dialog. (from HbDeviceDialogInterface) */ void closeDeviceDialog(bool byClient); - /* Returns a pointer to this dialog widget */ + /* Returns a pointer to this dialog widget. + (from HbDeviceDialogInterface) */ HbPopup *deviceDialogWidget() const; signals: @@ -79,29 +95,32 @@ Q_DISABLE_COPY(EapUsernamePwdDialog) - private: - /* Pointer to the line edit 1 object */ + private: // data + // NOT OWNED + //! Pointer to the line edit 1 object HbLineEdit *mEdit1; - /* Pointer to the line edit 2 object */ + //! Pointer to the line edit 2 object HbLineEdit *mEdit2; - /* Pointer to the user name validator object */ + // OWNED + //! Pointer to the user name validator object QScopedPointer mUnameValidator; - /* Pointer to the password validator object */ + //! Pointer to the password validator object QScopedPointer mPwdValidator; - /* Pointer to the HbTranslator */ + //! Pointer to the HbTranslator QScopedPointer mTranslator; - /* Tells whether close has already been called for the dialog */ + //! Tells whether close has already been called for the dialog bool mClose; - /* Tells whether Ok Action has already been pressed */ + //! Tells whether Ok Action has already been pressed bool mOkActionPressed; }; +/*! @} */ #endif // __EAPUSERNAMEPWDDIALOG_H__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/rom/eapdialogplugin.iby --- a/securitysettings/eapqtdialogs/rom/eapdialogplugin.iby Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/rom/eapdialogplugin.iby Wed Aug 18 09:50:56 2010 +0300 @@ -11,12 +11,12 @@ * * Contributors: * - * Description: + * Description: Image description file for the EAP Dialogs * */ /* - * %version: 1 % + * %version: 3 % */ #ifndef __EAPDIALOGPLUGIN_IBY__ diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/rom/eapdialogplugin_resources.iby --- a/securitysettings/eapqtdialogs/rom/eapdialogplugin_resources.iby Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/rom/eapdialogplugin_resources.iby Wed Aug 18 09:50:56 2010 +0300 @@ -11,12 +11,12 @@ * * Contributors: * - * Description: + * Description: Resource description file for the EAP Dialogs * */ /* - * %version: 1 % + * %version: 5 % */ #ifndef EAPDIALOGPLUGIN_RESOURCES_IBY diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapdialogplugin.cpp --- a/securitysettings/eapqtdialogs/src/eapdialogplugin.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapdialogplugin.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,11 +16,14 @@ */ /* -* %version: 8 % +* %version: 9 % */ +// System includes #include #include + +// User includes #include "eapdialogplugin.h" #include "eapusernamepwddialog.h" #include "eapquerydialog.h" @@ -38,11 +41,18 @@ #ifdef OST_TRACE_COMPILER_IN_USE #endif +/*! + * \class EapDialogPlugin + * \brief Implements Eap Dialog Plugin. + */ + +// External function prototypes Q_EXPORT_PLUGIN2(eapdialogplugin, EapDialogPlugin) +// Local constants -// This plugin implements one device dialog type +//! This plugin implements several device dialog types static const struct { const char *mTypeString; } dialogInfos[] = { @@ -60,9 +70,13 @@ {"com.nokia.eap.fastshowprovnotsuccessnotedialog/1.0"} }; -/** - * Constructor - */ +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + */ EapDialogPlugin::EapDialogPlugin() { OstTraceFunctionEntry0( EAPDIALOGPLUGIN_EAPDIALOGPLUGIN_ENTRY ); @@ -71,7 +85,7 @@ OstTraceFunctionExit0( EAPDIALOGPLUGIN_EAPDIALOGPLUGIN_EXIT ); } -/** +/*! * Destructor */ EapDialogPlugin::~EapDialogPlugin() @@ -81,8 +95,12 @@ OstTraceFunctionExit0( EAPDIALOGPLUGIN_DEAPDIALOGPLUGIN_EXIT ); } -/** +/*! * Create device dialog widget + * + * @param [in] deviceDialogType Tells which Dialog to create + * @param [in] parameters Parameters for the Construction of the dialog. + * @return created dialog widget */ HbDeviceDialogInterface *EapDialogPlugin::createDeviceDialog( const QString &deviceDialogType, @@ -90,76 +108,85 @@ { OstTraceFunctionEntry0( EAPDIALOGPLUGIN_CREATEDEVICEDIALOG_ENTRY ); qDebug("EapDialogPlugin::createDeviceDialog ENTER"); + + HbDeviceDialogInterface* dialog = NULL; - if ( deviceDialogType.compare("com.nokia.eap.usernamepassworddialog/1.0") == 0 ) + if ( deviceDialogType.compare(dialogInfos[0].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapUsernamePwdDialog"); - return ( new EapUsernamePwdDialog(parameters) ); + dialog = new EapUsernamePwdDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.querydialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[1].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapQueryDialog"); - return ( new EapQueryDialog(parameters) ); + dialog = new EapQueryDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.passwordquerydialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[2].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapPasswordQueryDialog"); - return ( new EapPasswordQueryDialog(parameters) ); + dialog = new EapPasswordQueryDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.fastinstallpacquerydialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[3].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapFastInstallPacQueryDialog"); - return ( new EapFastInstallPacQueryDialog(parameters) ); + dialog = new EapFastInstallPacQueryDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.fastpacstorepwquerydialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[4].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapFastPacStorePwQueryDialog"); - return ( new EapFastPacStorePwQueryDialog(parameters)); + dialog = new EapFastPacStorePwQueryDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.fastcreatemasterkeyquerydialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[5].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapFastCreateMasterKeyQueryDialog"); - return ( new EapFastCreateMasterKeyQueryDialog(parameters) ); + dialog = new EapFastCreateMasterKeyQueryDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.fastpacfilepwquerydialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[6].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapFastPacFilePwQueryDialog"); - return ( new EapFastPacFilePwQueryDialog(parameters) ); + dialog = new EapFastPacFilePwQueryDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.fastprovwaitnotedialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[7].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapFastProvWaitNoteDialog"); - return ( new EapFastProvWaitNoteDialog(parameters) ); + dialog = new EapFastProvWaitNoteDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.mschapv2passwordexpirednotedialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[8].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapMschapv2PwdExpNoteDialog"); - return ( new EapMschapv2PwdExpNoteDialog(parameters) ); + dialog = new EapMschapv2PwdExpNoteDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.mschapv2oldpassworddialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[9].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapMschapv2OldPwdDialog"); - return ( new EapMschapv2OldPwdDialog(parameters) ); + dialog = new EapMschapv2OldPwdDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.mschapv2newpassworddialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[10].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapMschapv2NewPwdDialog"); - return ( new EapMschapv2NewPwdDialog(parameters) ); + dialog = new EapMschapv2NewPwdDialog(parameters); } - else if ( deviceDialogType.compare("com.nokia.eap.fastshowprovnotsuccessnotedialog/1.0") == 0 ) + else if ( deviceDialogType.compare(dialogInfos[11].mTypeString) == 0 ) { qDebug("EapDialogPlugin::createDeviceDialog: new EapFastProvNotSuccessNoteDialog"); - return ( new EapFastProvNotSuccessNoteDialog(parameters) ); + dialog = new EapFastProvNotSuccessNoteDialog(parameters); } OstTraceFunctionExit0( EAPDIALOGPLUGIN_CREATEDEVICEDIALOG_EXIT ); qDebug("EapDialogPlugin::createDeviceDialog EXIT"); - return NULL; + return dialog; } -/** - * Check if client is allowed to use device dialog widget - */ +/*! + * Check if client is allowed to use device dialog widget. For the meantime + * this plugin doesn't perform operations that may compromise security. + * All clients are allowed to use. + * + * @param [in] deviceDialogType Tells which Dialog type + * @param [in] parameters Device dialog parameters + * @param [in] securityInfo Information for Security check + * @return returns always true + */ bool EapDialogPlugin::accessAllowed(const QString &deviceDialogType, const QVariantMap ¶meters, const QVariantMap &securityInfo) const { @@ -169,13 +196,16 @@ Q_UNUSED(parameters) Q_UNUSED(securityInfo) - // This plugin doesn't perform operations that may compromise security. - // All clients are allowed to use. return true; } -/** +/*! * Return information of device dialog the plugin creates + * + * @param [in] deviceDialogType Tells which Dialog type + * @param [in] parameters Device dialog parameters + * @param [in,out] info Structure the plugin fills with an information + * @return returns always true */ bool EapDialogPlugin::deviceDialogInfo(const QString &deviceDialogType, const QVariantMap ¶meters, DeviceDialogInfo *info) const @@ -195,8 +225,10 @@ return true; } -/** - * Return device dialog types this plugin implements +/*! + * Returns a list of device dialog types the plugin implements. + * + * @return returns device dialog types this plugin implements */ QStringList EapDialogPlugin::deviceDialogTypes() const { @@ -213,8 +245,10 @@ return types; } -/** +/*! * Return plugin flags + * + * @return returns plugin flags */ EapDialogPlugin::PluginFlags EapDialogPlugin::pluginFlags() const { @@ -223,8 +257,10 @@ return NoPluginFlags; } -/** +/*! * The last error is not stored, not supported + * + * @return returns always 0 */ int EapDialogPlugin::error() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapfastcreatemasterkeyquerydialog.cpp --- a/securitysettings/eapqtdialogs/src/eapfastcreatemasterkeyquerydialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapfastcreatemasterkeyquerydialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,14 +11,15 @@ * * Contributors: * -* Description: Fast Create Master Key Query Dialog implementation +* Description: EAP-FAST Create Master Key Query Dialog implementation * */ /* -* %version: 4 % +* %version: 5 % */ +// System includes #include #include #include @@ -27,14 +28,30 @@ #include #include #include + +// User includes #include "eapfastcreatemasterkeyquerydialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif +/*! + * \class EapFastCreateMasterKeyQueryDialog + * \brief Implements EAP-FAST Create Master Key Query Dialog. + */ -/** - * The constructor +// External function prototypes + +// Local constants + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapFastCreateMasterKeyQueryDialog::EapFastCreateMasterKeyQueryDialog(const QVariantMap ¶meters) :mEdit1(NULL), @@ -54,8 +71,10 @@ qDebug("EapFastCreateMasterKeyQueryDialog::EapFastCreateMasterKeyQueryDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapFastCreateMasterKeyQueryDialog::createDialog(const QVariantMap ¶meters ) { @@ -128,8 +147,8 @@ qDebug("EapFastCreateMasterKeyQueryDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapFastCreateMasterKeyQueryDialog::~EapFastCreateMasterKeyQueryDialog() { @@ -142,8 +161,10 @@ OstTraceFunctionExit0( EAPFASTCREATEMASTERKEYQUERYDIALOG_DEAPFASTCREATEMASTERKEYQUERYDIALOG_EXIT ); } -/** +/*! * Line edit validator + * + * @return true if content is valid. */ bool EapFastCreateMasterKeyQueryDialog::validate() const { @@ -151,8 +172,6 @@ bool valid = false; - EapQtValidator::Status test_status = mPwdValidator->validate(mEdit1->text()); - if ( mPwdValidator->validate(mEdit1->text())== EapQtValidator::StatusOk && mEdit1->text() == mEdit2->text()) { qDebug("EapFastCreateMasterKeyQueryDialog::validate: ret val: TRUE"); @@ -161,7 +180,7 @@ return valid; } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapFastCreateMasterKeyQueryDialog::okPressed() @@ -191,7 +210,7 @@ qDebug("EapFastCreateMasterKeyQueryDialog::okPressed EXIT"); } -/** +/*! * Function is called when the Cancel Action button is pressed */ void EapFastCreateMasterKeyQueryDialog::cancelPressed() @@ -207,9 +226,8 @@ OstTraceFunctionExit0( EAPFASTCREATEMASTERKEYQUERYDIALOG_CANCELPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapFastCreateMasterKeyQueryDialog::closingDialog() { @@ -220,9 +238,13 @@ OstTraceFunctionExit0( EAPFASTCREATEMASTERKEYQUERYDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapFastCreateMasterKeyQueryDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -235,8 +257,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapFastCreateMasterKeyQueryDialog::deviceDialogError() const { @@ -245,8 +269,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapFastCreateMasterKeyQueryDialog::closeDeviceDialog(bool byClient) { @@ -264,8 +290,10 @@ OstTraceFunctionExit0( EAPFASTCREATEMASTERKEYQUERYDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapFastCreateMasterKeyQueryDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapfastinstallpacquerydialog.cpp --- a/securitysettings/eapqtdialogs/src/eapfastinstallpacquerydialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapfastinstallpacquerydialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,30 +11,48 @@ * * Contributors: * -* Description: Fast Install Pac Query Dialog implementation +* Description: EAP-FAST Install PAC Query Dialog implementation * */ /* -* %version: 3 % +* %version: 4 % */ +// System includes #include #include #include + +// User includes #include "eapfastinstallpacquerydialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -// The index numbers of the button of the dialog -const int yesButtonIndex = 1; +/*! + * \class EapFastInstallPacQueryDialog + * \brief Implements EAP-FAST Install PAC Query Dialog. + */ + +// External function prototypes + +// Local constants -/** - * The constructor +//! The index numbers of the button of the dialog +static const int yesButtonIndex = 1; + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapFastInstallPacQueryDialog::EapFastInstallPacQueryDialog(const QVariantMap ¶meters) -:HbMessageBox("default text...",HbMessageBox::MessageTypeQuestion), +:HbMessageBox(HbMessageBox::MessageTypeQuestion), mTranslator(new HbTranslator("eapprompts")), mClose(false), mYesActionPressed(false) @@ -48,8 +66,10 @@ qDebug("EapFastInstallPacQueryDialog::EapFastInstallPacQueryDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapFastInstallPacQueryDialog::createDialog(const QVariantMap ¶meters ) { @@ -116,8 +136,8 @@ qDebug("EapFastInstallPacQueryDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapFastInstallPacQueryDialog::~EapFastInstallPacQueryDialog() { @@ -128,7 +148,7 @@ OstTraceFunctionExit0( EAPGTCQUERYDIALOG_DEAPGTCQUERYDIALOG_EXIT ); } -/** +/*! * Function is called when the Yes Action button is pressed */ void EapFastInstallPacQueryDialog::yesPressed() @@ -141,8 +161,8 @@ mYesActionPressed = true; QVariantMap data; - QVariant variant(yesButtonIndex); - data.insert("yesbutton", variant); + data["yesbutton"] = yesButtonIndex; + // emit the data of the selected button and close the dialog qDebug("EapFastInstallPacQueryDialog::yesPressed: emit deviceDialogData"); emit deviceDialogData(data); @@ -152,7 +172,7 @@ qDebug("EapFastInstallPacQueryDialog::yesPressed EXIT"); } -/** +/*! * Function is called when the No Action button is pressed */ void EapFastInstallPacQueryDialog::noPressed() @@ -168,9 +188,8 @@ OstTraceFunctionExit0( EAPFASTINSTALLPACQUERYDIALOG_NOPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapFastInstallPacQueryDialog::closingDialog() { @@ -181,9 +200,13 @@ OstTraceFunctionExit0( EAPFASTINSTALLPACQUERYDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapFastInstallPacQueryDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -196,8 +219,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapFastInstallPacQueryDialog::deviceDialogError() const { @@ -206,8 +231,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapFastInstallPacQueryDialog::closeDeviceDialog(bool byClient) { @@ -225,8 +252,10 @@ OstTraceFunctionExit0( EAPFASTINSTALLPACQUERYDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapFastInstallPacQueryDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapfastpacfilepwquerydialog.cpp --- a/securitysettings/eapqtdialogs/src/eapfastpacfilepwquerydialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapfastpacfilepwquerydialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,25 +11,44 @@ * * Contributors: * -* Description: Fast Pac File Password Query Dialog implementation +* Description: EAP-FAST PAC File Password Query Dialog implementation * */ /* -* %version: 3 % +* %version: 4 % */ +// System includes #include #include #include + +// User includes #include "eapfastpacfilepwquerydialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -/** - * The constructor +/*! + * \class EapFastPacFilePwQueryDialog + * \brief Implements EAP-FAST PAC File Password Query Dialog. + */ + +// External function prototypes + +// Local constants +static const uint PacFilePwQueryTimeout = 60000; + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapFastPacFilePwQueryDialog::EapFastPacFilePwQueryDialog(const QVariantMap ¶meters) :mEdit(NULL), @@ -46,8 +65,10 @@ qDebug("EapFastPacFilePwQueryDialog::EapFastPacFilePwQueryDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapFastPacFilePwQueryDialog::createDialog(const QVariantMap ¶meters ) { @@ -71,7 +92,7 @@ //Set the dialog to be on the screen for 60 seconds, unless //the user reacts earlier this->setModal(true); - this->setTimeout(60000); + this->setTimeout(PacFilePwQueryTimeout); this->setDismissPolicy(HbPopup::NoDismiss); this->setPromptText(mainText, 0); mEdit = this->lineEdit(0); @@ -114,8 +135,8 @@ qDebug("EapFastPacFilePwQueryDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapFastPacFilePwQueryDialog::~EapFastPacFilePwQueryDialog() { @@ -126,7 +147,7 @@ OstTraceFunctionExit0( EAPFASTPACFILEQUERYDIALOG_DEAPFASTPACFILEQUERYDIALOG_EXIT ); } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapFastPacFilePwQueryDialog::okPressed() @@ -151,7 +172,7 @@ qDebug("EapFastPacFilePwQueryDialog::okPressed EXIT"); } -/** +/*! * Function is called when the Cancel Action button is pressed */ void EapFastPacFilePwQueryDialog::cancelPressed() @@ -167,9 +188,8 @@ OstTraceFunctionExit0( EAPFASTPACFILEQUERYDIALOG_CANCELPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapFastPacFilePwQueryDialog::closingDialog() { @@ -180,9 +200,13 @@ OstTraceFunctionExit0( EAPFASTPACFILEQUERYDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapFastPacFilePwQueryDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -195,8 +219,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapFastPacFilePwQueryDialog::deviceDialogError() const { @@ -205,8 +231,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapFastPacFilePwQueryDialog::closeDeviceDialog(bool byClient) { @@ -224,8 +252,10 @@ OstTraceFunctionExit0( EAPFASTPACFILEQUERYDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapFastPacFilePwQueryDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapfastpacstorepwquerydialog.cpp --- a/securitysettings/eapqtdialogs/src/eapfastpacstorepwquerydialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapfastpacstorepwquerydialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,14 +11,15 @@ * * Contributors: * -* Description: Fast Pac Store Password Query Dialog implementation +* Description: EAP-FAST PAC Store Password Query Dialog implementation * */ /* -* %version: 5 % +* %version: 6 % */ +// System includes #include #include #include @@ -28,14 +29,32 @@ #include #include #include + +// User includes #include "eapfastpacstorepwquerydialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -/** - * The constructor +/*! + * \class EapFastPacStorePwQueryDialog + * \brief Implements EAP-FAST PAC Store Password Query Dialog. + */ + +// External function prototypes + +// Local constants +static const uint PacStorePwQueryTimeout = 60000; + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapFastPacStorePwQueryDialog::EapFastPacStorePwQueryDialog(const QVariantMap ¶meters) :mEdit(NULL), @@ -46,29 +65,29 @@ { OstTraceFunctionEntry0( EAPFASTPACSTOREPWQUERYDIALOG_EAPFASTPACSTOREPWQUERYDIALOG_ENTRY ); qDebug("EapFastPacStorePwQueryDialog::EapFastPacStorePwQueryDialog ENTER"); + + Q_UNUSED(parameters) - createDialog(parameters); + createDialog(); OstTraceFunctionExit0( EAPFASTPACSTOREPWQUERYDIALOG_EAPFASTPACSTOREPWQUERYDIALOG_EXIT ); qDebug("EapFastPacStorePwQueryDialog::EapFastPacStorePwQueryDialog EXIT"); } -/** +/*! * The construction of the dialog */ -void EapFastPacStorePwQueryDialog::createDialog(const QVariantMap ¶meters ) +void EapFastPacStorePwQueryDialog::createDialog() { OstTraceFunctionEntry0( EAPFASTPACSTOREPWQUERYDIALOG_CREATEDIALOG_ENTRY ); qDebug("EapFastPacStorePwQueryDialog::createDialog ENTER"); QString labelText(hbTrId("txt_occ_dialog_pac_store_password")); - Q_UNUSED(parameters) - // Set the dialog to be on the screen for 60 seconds, unless // the user reacts earlier this->setModal(true); - this->setTimeout(60000); + this->setTimeout(PacStorePwQueryTimeout); this->setDismissPolicy(HbPopup::NoDismiss); this->setPromptText(labelText, 0); @@ -121,8 +140,8 @@ qDebug("EapFastPacStorePwQueryDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapFastPacStorePwQueryDialog::~EapFastPacStorePwQueryDialog() { @@ -134,8 +153,10 @@ OstTraceFunctionExit0( EAPFASTPACSTOREPWQUERYDIALOG_DEAPFASTPACSTOREPWQUERYDIALOG_EXIT ); } -/** +/*! * Line edit validator + * + * @return true if content is valid. */ bool EapFastPacStorePwQueryDialog::validate() const { @@ -152,7 +173,7 @@ return valid; } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapFastPacStorePwQueryDialog::okPressed() @@ -184,7 +205,7 @@ qDebug("EapFastPacStorePwQueryDialog::okPressed EXIT"); } -/** +/*! * Function is called when the Cancel Action button is pressed */ void EapFastPacStorePwQueryDialog::cancelPressed() @@ -200,9 +221,8 @@ OstTraceFunctionExit0( EAPFASTPACSTOREPWQUERYDIALOG_CANCELPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapFastPacStorePwQueryDialog::closingDialog() { @@ -213,9 +233,13 @@ OstTraceFunctionExit0( EAPFASTPACSTOREPWQUERYDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapFastPacStorePwQueryDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -228,8 +252,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapFastPacStorePwQueryDialog::deviceDialogError() const { @@ -238,8 +264,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapFastPacStorePwQueryDialog::closeDeviceDialog(bool byClient) { @@ -257,8 +285,10 @@ OstTraceFunctionExit0( EAPFASTPACSTOREPWQUERYDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapFastPacStorePwQueryDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapfastprovnotsuccessnotedialog.cpp --- a/securitysettings/eapqtdialogs/src/eapfastprovnotsuccessnotedialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapfastprovnotsuccessnotedialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,53 +11,71 @@ * * Contributors: * -* Description: Fast Provisioning not successfull note Dialog implementation +* Description: EAP-FAST Provisioning not successfull note Dialog implementation * */ /* -* %version: 3 % +* %version: 4 % */ +// System includes #include #include + +// User includes #include "eapfastprovnotsuccessnotedialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -// The index numbers of the button of the dialog -const int okButtonIndex = 1; +/*! + * \class EapFastProvNotSuccessNoteDialog + * \brief Implements EAP-MSCHAPv2 New Password Input Dialog. + */ + +// External function prototypes + +// Local constants -/** - * The constructor +//! The index numbers of the button of the dialog +static const int okButtonIndex = 1; + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapFastProvNotSuccessNoteDialog::EapFastProvNotSuccessNoteDialog(const QVariantMap ¶meters) -:HbMessageBox("default text...",HbMessageBox::MessageTypeWarning), +:HbMessageBox(HbMessageBox::MessageTypeWarning), mTranslator(new HbTranslator("eapprompts")), mOkActionPressed(false) { OstTraceFunctionEntry0( EAPFASTPROVNOTSUCCESSNOTEDIALOG_EAPFASTPROVNOTSUCCESSNOTEDIALOG_ENTRY ); qDebug("EapFastProvNotSuccessNoteDialog::EapFastProvNotSuccessNoteDialog ENTER"); + + Q_UNUSED(parameters) - createDialog( parameters ); + createDialog(); OstTraceFunctionExit0( EAPFASTPROVNOTSUCCESSNOTEDIALOG_EAPFASTPROVNOTSUCCESSNOTEDIALOG_EXIT ); qDebug("EapFastProvNotSuccessNoteDialog::EapFastProvNotSuccessNoteDialog EXIT"); } -/** +/*! * The construction of the dialog */ -void EapFastProvNotSuccessNoteDialog::createDialog(const QVariantMap ¶meters ) +void EapFastProvNotSuccessNoteDialog::createDialog() { OstTraceFunctionEntry0( EAPFASTPROVNOTSUCCESSNOTEDIALOG_CREATEDIALOG_ENTRY ); qDebug("EapFastProvNotSuccessNoteDialog::createDialog ENTER"); QString text(hbTrId("txt_occ_info_provisioning_not_successful_reactiv")); - - Q_UNUSED(parameters) - + //Set the dialog to be on the screen until user reacts //by pressing the Action button this->setModal(true); @@ -93,8 +111,8 @@ qDebug("EapFastProvNotSuccessNoteDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapFastProvNotSuccessNoteDialog::~EapFastProvNotSuccessNoteDialog() { @@ -105,7 +123,7 @@ OstTraceFunctionExit0( EAPFASTPROVNOTSUCCESSNOTEDIALOG_DEAPFASTPROVNOTSUCCESSNOTEDIALOG_EXIT ); } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapFastProvNotSuccessNoteDialog::okPressed() @@ -118,8 +136,8 @@ mOkActionPressed = true; QVariantMap data; - QVariant variant(okButtonIndex); - data.insert("okbutton", variant); + data["okbutton"] = okButtonIndex; + // emit the data of the selected button and close the dialog qDebug("EapFastProvNotSuccessNoteDialog::okPressed: emit deviceDialogData"); emit deviceDialogData(data); @@ -130,7 +148,7 @@ qDebug("EapFastProvNotSuccessNoteDialog::okPressed EXIT"); } -/** +/*! * Function is called when the dialog is about to close * */ @@ -143,9 +161,13 @@ OstTraceFunctionExit0( EAPFASTPROVNOTSUCCESSNOTEDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapFastProvNotSuccessNoteDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -158,8 +180,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapFastProvNotSuccessNoteDialog::deviceDialogError() const { @@ -168,8 +192,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapFastProvNotSuccessNoteDialog::closeDeviceDialog(bool byClient) { @@ -184,8 +210,10 @@ OstTraceFunctionExit0( EAPFASTPROVNOTSUCCESSNOTEDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapFastProvNotSuccessNoteDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapfastprovwaitnotedialog.cpp --- a/securitysettings/eapqtdialogs/src/eapfastprovwaitnotedialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapfastprovwaitnotedialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,18 +16,35 @@ */ /* -* %version: 2 % +* %version: 3 % */ +// System includes #include + +// User includes #include "eapfastprovwaitnotedialog.h" #include "OstTraceDefinitions.h" -#include #ifdef OST_TRACE_COMPILER_IN_USE #endif -/** - * The constructor +/*! + * \class EapFastProvWaitNoteDialog + * \brief Implements Fast Provisioning Wait Notification Dialog. + */ + +// External function prototypes + +// Local constants + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapFastProvWaitNoteDialog::EapFastProvWaitNoteDialog(const QVariantMap ¶meters) :mTranslator(new HbTranslator("eapprompts")) @@ -41,8 +58,10 @@ qDebug("EapFastProvWaitNoteDialog::EapFastProvWaitNoteDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapFastProvWaitNoteDialog::createDialog(const QVariantMap ¶meters ) { @@ -84,8 +103,8 @@ qDebug("EapFastProvWaitNoteDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapFastProvWaitNoteDialog::~EapFastProvWaitNoteDialog() { @@ -98,9 +117,8 @@ OstTraceFunctionExit0( EAPFASTPROVWAITNOTEDIALOG_DEAPFASTPROVWAITNOTEDIALOG_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapFastProvWaitNoteDialog::closingDialog() { @@ -113,9 +131,13 @@ OstTraceFunctionExit0( EAPFASTPROVWAITNOTEDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapFastProvWaitNoteDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -128,8 +150,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapFastProvWaitNoteDialog::deviceDialogError() const { @@ -138,8 +162,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapFastProvWaitNoteDialog::closeDeviceDialog(bool byClient) { @@ -154,8 +180,10 @@ OstTraceFunctionExit0( EAPFASTPROVWAITNOTEDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapFastProvWaitNoteDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapmschapv2newpwddialog.cpp --- a/securitysettings/eapqtdialogs/src/eapmschapv2newpwddialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapmschapv2newpwddialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,14 +11,16 @@ * * Contributors: * -* Description: EAP-MSCHAPv2 New Password Input Dialog implementation +* Description: +* EAP-MSCHAPv2 New Password Input Dialog implementation * */ /* -* %version: 4 % +* %version: 5 % */ +// System includes #include #include #include @@ -27,14 +29,30 @@ #include #include #include + +// User includes #include "eapmschapv2newpwddialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif +/*! + * \class EapMschapv2NewPwdDialog + * \brief Implements EAP-MSCHAPv2 New Password Input Dialog. + */ -/** - * The constructor +// External function prototypes + +// Local constants + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapMschapv2NewPwdDialog::EapMschapv2NewPwdDialog(const QVariantMap ¶meters) :mEdit1(NULL), @@ -53,8 +71,10 @@ qDebug("EapMschapv2NewPwdDialog::EapMschapv2NewPwdDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapMschapv2NewPwdDialog::createDialog(const QVariantMap ¶meters ) { @@ -73,17 +93,19 @@ this->setDismissPolicy(HbPopup::NoDismiss); this->setAdditionalRowVisible(true); + //Set the first Line Edit to be on the screen this->setPromptText(labelText1, 0); mEdit1 = this->lineEdit(0); mEdit1->setEchoMode(HbLineEdit::Password); + //Set the second Line Edit to be on the screen also this->setPromptText(labelText2, 1); mEdit2 = this->lineEdit(1); mEdit2->setEchoMode(HbLineEdit::Password); - EapQtConfigInterface eap_config_if; + EapQtConfigInterface eapConfigIf; - mPwdValidator.reset( eap_config_if.validatorEap(EapQtExpandedEapType::TypeEapMschapv2, + mPwdValidator.reset( eapConfigIf.validatorEap(EapQtExpandedEapType::TypeEapMschapv2, EapQtConfig::Password ) ); Q_ASSERT( mPwdValidator.isNull() == false ); @@ -126,8 +148,8 @@ qDebug("EapMschapv2NewPwdDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapMschapv2NewPwdDialog::~EapMschapv2NewPwdDialog() { @@ -140,17 +162,17 @@ OstTraceFunctionExit0( EAPMSCHAPV2NEWPWDDIALOG_DEAPMSCHAPV2NEWPWDDIALOG_EXIT ); } -/** +/*! * Line edit validator + * + * @return true if content is valid. */ bool EapMschapv2NewPwdDialog::validate() const { qDebug("EapMschapv2NewPwdDialog::validate ENTER"); bool valid = false; - - EapQtValidator::Status test_status = mPwdValidator->validate(mEdit1->text()); - + if ( mPwdValidator->validate(mEdit1->text())== EapQtValidator::StatusOk && mEdit1->text() == mEdit2->text()) { qDebug("EapMschapv2NewPwdDialog::validate: ret val: TRUE"); @@ -160,7 +182,7 @@ return valid; } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapMschapv2NewPwdDialog::okPressed() @@ -190,7 +212,7 @@ qDebug("EapMschapv2NewPwdDialog::okPressed EXIT"); } -/** +/*! * Function is called when the Cancel Action button is pressed */ void EapMschapv2NewPwdDialog::cancelPressed() @@ -206,9 +228,8 @@ OstTraceFunctionExit0( EAPMSCHAPV2NEWPWDDIALOG_CANCELPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapMschapv2NewPwdDialog::closingDialog() { @@ -219,9 +240,13 @@ OstTraceFunctionExit0( EAPMSCHAPV2NEWPWDDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapMschapv2NewPwdDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -234,8 +259,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapMschapv2NewPwdDialog::deviceDialogError() const { @@ -244,8 +271,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapMschapv2NewPwdDialog::closeDeviceDialog(bool byClient) { @@ -262,8 +291,10 @@ OstTraceFunctionExit0( EAPMSCHAPV2NEWPWDDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapMschapv2NewPwdDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapmschapv2oldpwddialog.cpp --- a/securitysettings/eapqtdialogs/src/eapmschapv2oldpwddialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapmschapv2oldpwddialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,23 +11,46 @@ * * Contributors: * -* Description: EAP-MSCHAPv2 Old Password Input Dialog implementation +* Description: +* EAP-MSCHAPv2 Old Password Input Dialog implementation * */ +/* +* %version: 5 % +*/ + +// System includes #include #include #include #include #include #include + +// User includes #include "eapmschapv2oldpwddialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -/** - * The constructor +/*! + * \class EapMschapv2OldPwdDialog + * \brief Implements EAP-MSCHAPv2 Old Password Input Dialog. + */ + +// External function prototypes + +// Local constants + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapMschapv2OldPwdDialog::EapMschapv2OldPwdDialog(const QVariantMap ¶meters) :mEdit(NULL), @@ -45,8 +68,10 @@ qDebug("EapMschapv2OldPwdDialog::EapMschapv2OldPwdDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapMschapv2OldPwdDialog::createDialog(const QVariantMap ¶meters ) { @@ -111,7 +136,7 @@ qDebug("EapMschapv2OldPwdDialog::createDialog EXIT"); } -/** +/*! * Destructor */ EapMschapv2OldPwdDialog::~EapMschapv2OldPwdDialog() @@ -124,8 +149,10 @@ OstTraceFunctionExit0( EAPMSCHAPV2OLDPWDDIALOG_DEAPMSCHAPV2OLDPWDDIALOG_EXIT ); } -/** +/*! * Line edit validator + * + * @return true if content is valid. */ bool EapMschapv2OldPwdDialog::validate() const { @@ -142,12 +169,12 @@ return valid; } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapMschapv2OldPwdDialog::okPressed() { - OstTraceFunctionEntry0( EAPMSCHAPV2OLDPWDDIALOG_FIRSTBUTTONPRESSED_ENTRY ); + OstTraceFunctionEntry0( EAPMSCHAPV2OLDPWDDIALOG_OKPRESSED_ENTRY ); qDebug("EapMschapv2OldPwdDialog::okPressed ENTER"); if ( validate() == true && mOkActionPressed == false ) { @@ -164,11 +191,11 @@ closeDeviceDialog(true); } - OstTraceFunctionExit0( EAPMSCHAPV2OLDPWDDIALOG_FIRSTBUTTONPRESSED_EXIT ); + OstTraceFunctionExit0( EAPMSCHAPV2OLDPWDDIALOG_OKPRESSED_EXIT ); qDebug("EapMschapv2OldPwdDialog::okPressed EXIT"); } -/** +/*! * Function is called when the Cancel Action button is pressed */ void EapMschapv2OldPwdDialog::cancelPressed() @@ -184,9 +211,8 @@ OstTraceFunctionExit0( EAPMSCHAPV2OLDPWDDIALOG_CANCELPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapMschapv2OldPwdDialog::closingDialog() { @@ -198,8 +224,12 @@ OstTraceFunctionExit0( EAPMSCHAPV2OLDPWDDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. */ bool EapMschapv2OldPwdDialog::setDeviceDialogParameters (const QVariantMap ¶meters) @@ -213,8 +243,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapMschapv2OldPwdDialog::deviceDialogError() const { @@ -223,8 +255,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapMschapv2OldPwdDialog::closeDeviceDialog(bool byClient) { @@ -241,8 +275,10 @@ OstTraceFunctionExit0( EAPMSCHAPV2OLDPWDDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapMschapv2OldPwdDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapmschapv2pwdexpirednotedialog.cpp --- a/securitysettings/eapqtdialogs/src/eapmschapv2pwdexpirednotedialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapmschapv2pwdexpirednotedialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,21 +16,39 @@ */ /* -* %version: 2 % +* %version: 3 % */ +// System includes #include #include + +// User includes #include "eapmschapv2pwdexpirednotedialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -// The index numbers of the button of the dialog -const int okButtonIndex = 1; +/*! + * \class EapMschapv2NewPwdDialog + * \brief Implements EAP-MSCHAPv2 New Password Input Dialog. + */ + +// External function prototypes + +// Local constants -/** - * The constructor +//! The index numbers of the button of the dialog +static const int okButtonIndex = 1; + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapMschapv2PwdExpNoteDialog::EapMschapv2PwdExpNoteDialog(const QVariantMap ¶meters) :HbMessageBox("default text...",HbMessageBox::MessageTypeInformation), @@ -39,24 +57,24 @@ { OstTraceFunctionEntry0( EAPMSCHAPV2PWDEXPNOTEDIALOG_EAPMSCHAPV2PWDEXPNOTEDIALOG_ENTRY ); qDebug("EapMschapv2PwdExpNoteDialog::EapMschapv2PwdExpNoteDialog ENTER"); + + Q_UNUSED(parameters) - createDialog( parameters ); + createDialog(); OstTraceFunctionExit0( EAPMSCHAPV2PWDEXPNOTEDIALOG_EAPMSCHAPV2PWDEXPNOTEDIALOG_EXIT ); qDebug("EapMschapv2PwdExpNoteDialog::EapMschapv2PwdExpNoteDialog EXIT"); } -/** +/*! * The construction of the dialog */ -void EapMschapv2PwdExpNoteDialog::createDialog(const QVariantMap ¶meters ) +void EapMschapv2PwdExpNoteDialog::createDialog() { OstTraceFunctionEntry0( EAPMSCHAPV2PWDEXPNOTEDIALOG_CREATEDIALOG_ENTRY ); qDebug("EapMschapv2PwdExpNoteDialog::createDialog ENTER"); QString text(hbTrId("txt_occ_info_eapmschapv2_password_has_expired_yo")); - - Q_UNUSED(parameters) //Set the dialog to be on the screen until user reacts //by pressing the Action button @@ -94,7 +112,7 @@ qDebug("EapMschapv2PwdExpNoteDialog::createDialog EXIT"); } -/** +/*! * Destructor */ EapMschapv2PwdExpNoteDialog::~EapMschapv2PwdExpNoteDialog() @@ -106,7 +124,7 @@ OstTraceFunctionExit0( EAPMSCHAPV2PWDEXPNOTEDIALOG_DEAPMSCHAPV2PWDEXPNOTEDIALOG_EXIT ); } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapMschapv2PwdExpNoteDialog::okPressed() @@ -119,8 +137,8 @@ mOkActionPressed = true; QVariantMap data; - QVariant variant(okButtonIndex); - data.insert("okbutton", variant); + data["okbutton"] = okButtonIndex; + // emit the data of the selected button and close the dialog qDebug("EapMschapv2PwdExpNoteDialog::okPressed: emit deviceDialogData"); emit deviceDialogData(data); @@ -131,7 +149,7 @@ qDebug("EapMschapv2PwdExpNoteDialog::okPressed EXIT"); } -/** +/*! * Function is called when the dialog is about to close * */ @@ -144,9 +162,13 @@ OstTraceFunctionExit0( EAPMSCHAPV2PWDEXPNOTEDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapMschapv2PwdExpNoteDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -159,8 +181,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapMschapv2PwdExpNoteDialog::deviceDialogError() const { @@ -169,8 +193,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapMschapv2PwdExpNoteDialog::closeDeviceDialog(bool byClient) { @@ -186,8 +212,10 @@ OstTraceFunctionExit0( EAPMSCHAPV2PWDEXPNOTEDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapMschapv2PwdExpNoteDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eappasswordquerydialog.cpp --- a/securitysettings/eapqtdialogs/src/eappasswordquerydialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eappasswordquerydialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -16,9 +16,10 @@ */ /* -* %version: 4 % +* %version: 5 % */ +// System includes #include #include #include @@ -28,14 +29,31 @@ #include #include #include + +// User includes #include "eappasswordquerydialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif +/*! + * \class EapPasswordQueryDialog + * \brief Implements Password Query Dialog. + */ -/** - * The constructor +// External function prototypes + +// Local constants + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapPasswordQueryDialog::EapPasswordQueryDialog(const QVariantMap ¶meters) :mEdit(NULL), @@ -53,8 +71,10 @@ qDebug("EapPasswordQueryDialog::EapPasswordQueryDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapPasswordQueryDialog::createDialog(const QVariantMap ¶meters ) { @@ -138,7 +158,7 @@ qDebug("EapPasswordQueryDialog::createDialog EXIT"); } -/** +/*! * Destructor */ EapPasswordQueryDialog::~EapPasswordQueryDialog() @@ -151,8 +171,10 @@ OstTraceFunctionExit0( EAPPASSWORDQUERYDIALOG_DEAPPASSWORDQUERYDIALOG_EXIT ); } -/** +/*! * Line edit validator + * + * @return true if content is valid. */ bool EapPasswordQueryDialog::validate() const { @@ -170,7 +192,7 @@ return valid; } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapPasswordQueryDialog::okPressed() @@ -195,7 +217,7 @@ qDebug("EapPasswordQueryDialog::okPressed EXIT"); } -/** +/*! * Function is called when the Cancel Action button is pressed */ void EapPasswordQueryDialog::cancelPressed() @@ -211,9 +233,8 @@ OstTraceFunctionExit0( EAPPASSWORDQUERYDIALOG_CANCELPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapPasswordQueryDialog::closingDialog() { @@ -225,9 +246,13 @@ OstTraceFunctionExit0( EAPPASSWORDQUERYDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapPasswordQueryDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -240,8 +265,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapPasswordQueryDialog::deviceDialogError() const { @@ -250,8 +277,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapPasswordQueryDialog::closeDeviceDialog(bool byClient) { @@ -269,8 +298,10 @@ OstTraceFunctionExit0( EAPPASSWORDQUERYDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapPasswordQueryDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapquerydialog.cpp --- a/securitysettings/eapqtdialogs/src/eapquerydialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapquerydialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,28 +11,46 @@ * * Contributors: * -* Description: EAP query Dialog implementation +* Description: EAP Challenge query Dialog implementation * */ /* -* %version: 2 % +* %version: 3 % */ +// System includes #include #include #include #include + +// User includes #include "eapquerydialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -// The index numbers of the button of the dialog -const int okButtonIndex = 1; +/*! + * \class EapQueryDialog + * \brief Implements EAP Challenge query Dialog. + */ + +// External function prototypes + +// Local constants -/** - * The constructor +//! The index numbers of the button of the dialog +static const int okButtonIndex = 1; + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapQueryDialog::EapQueryDialog(const QVariantMap ¶meters) :mTranslator(new HbTranslator("eapprompts")), @@ -47,9 +65,10 @@ qDebug("EapQueryDialog::EapQueryDialog EXIT"); } - -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapQueryDialog::createDialog(const QVariantMap ¶meters ) { @@ -122,8 +141,8 @@ qDebug("EapQueryDialog::createDialog EXIT"); } -/** - * Destructor +/*! + * Destructor. */ EapQueryDialog::~EapQueryDialog() { @@ -134,7 +153,7 @@ OstTraceFunctionExit0( EAPQUERYDIALOG_DEAPQUERYDIALOG_EXIT ); } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapQueryDialog::okPressed() @@ -147,8 +166,8 @@ mOkActionPressed = true; QVariantMap data; - QVariant variant(okButtonIndex); - data.insert("okbutton", variant); + data["okbutton"] = okButtonIndex; + // emit the data of the selected button and close the dialog qDebug("EapQueryDialog::okPressed: emit deviceDialogData"); emit deviceDialogData(data); @@ -159,9 +178,8 @@ qDebug("EapQueryDialog::okPressed EXIT"); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapQueryDialog::closingDialog() { @@ -172,9 +190,13 @@ OstTraceFunctionExit0( EAPQUERYDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapQueryDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -187,8 +209,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapQueryDialog::deviceDialogError() const { @@ -197,8 +221,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapQueryDialog::closeDeviceDialog(bool byClient) { @@ -214,8 +240,10 @@ OstTraceFunctionExit0( EAPQUERYDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapQueryDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp --- a/securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -11,14 +11,16 @@ * * Contributors: * -* Description: User authentication Dialog implementation +* Description: +* User authentication Dialog implementation * */ /* - * %version: 4 % + * %version: 5 % */ +// System includes #include #include #include @@ -27,14 +29,31 @@ #include #include #include + +// User includes #include "eapusernamepwddialog.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #endif -/** - * The constructor +/*! + * \class EapUsernamePwdDialog + * \brief Implements Username Password Input Dialog. + */ + +// External function prototypes + +// Local constants + +// ======== LOCAL FUNCTIONS ======== + +// ======== MEMBER FUNCTIONS ======== + +/*! + * Constructor. + * + * @param [in] parameters Parameters for the Constructor. */ EapUsernamePwdDialog::EapUsernamePwdDialog(const QVariantMap ¶meters) :mEdit1(NULL), @@ -54,8 +73,10 @@ qDebug("EapUsernamePwdDialog::EapUsernamePwdDialog EXIT"); } -/** +/*! * The construction of the dialog + * + * @param [in] parameters Parameters for the Construction of the dialog. */ void EapUsernamePwdDialog::createDialog(const QVariantMap ¶meters ) { @@ -92,10 +113,13 @@ this->setDismissPolicy(HbPopup::NoDismiss); this->setAdditionalRowVisible(true); + //Set the first Line Edit (user name) to be on the screen this->setPromptText(labelText1, 0); mEdit1 = this->lineEdit(0); + //Set default user name string mEdit1->setText(unamestr); + //Set the second Line Edit (password) to be on the screen also this->setPromptText(labelText2, 1); mEdit2 = this->lineEdit(1); @@ -157,7 +181,7 @@ qDebug("EapUsernamePwdDialog::createDialog EXIT"); } -/** +/*! * Destructor */ EapUsernamePwdDialog::~EapUsernamePwdDialog() @@ -172,8 +196,10 @@ OstTraceFunctionExit0( EAPUSERNAMEPWDDIALOG_DEAPUSERNAMEPWDDIALOG_EXIT ); } -/** - * Line Edit Validator +/*! + * Line edit validator + * + * @return true if content is valid. */ bool EapUsernamePwdDialog::validate() const { @@ -192,7 +218,7 @@ return valid; } -/** +/*! * Function is called when the Ok Action button is pressed */ void EapUsernamePwdDialog::okPressed() @@ -218,7 +244,7 @@ qDebug("EapUsernamePwdDialog::okPressed EXIT"); } -/** +/*! * Function is called when the Cancel Action button is pressed */ void EapUsernamePwdDialog::cancelPressed() @@ -234,9 +260,8 @@ OstTraceFunctionExit0( EAPUSERNAMEPWDDIALOG_CANCELPRESSED_EXIT ); } -/** +/*! * Function is called when the dialog is about to close - * */ void EapUsernamePwdDialog::closingDialog() { @@ -247,9 +272,13 @@ OstTraceFunctionExit0( EAPUSERNAMEPWDDIALOG_CLOSINGDIALOG_EXIT ); } -/** - * Updating the dialog during its showing is not allowed. - */ +/*! + * Device dialog parameters to be set while dialog is displayed. + * Not supported. + * + * @param [in] parameters NOT USED + * @return true always. + */ bool EapUsernamePwdDialog::setDeviceDialogParameters (const QVariantMap ¶meters) { @@ -262,8 +291,10 @@ return true; } -/** - * Not supported, 0 always returned +/*! + * Not supported + * + * @return 0 always returned. */ int EapUsernamePwdDialog::deviceDialogError() const { @@ -272,8 +303,10 @@ return 0; } -/** +/*! * Dialog is closed and the signal about closing is emitted + * + * @param [in] byClient indicates when the user closes the dialog */ void EapUsernamePwdDialog::closeDeviceDialog(bool byClient) { @@ -291,8 +324,10 @@ OstTraceFunctionExit0( EAPUSERNAMEPWDDIALOG_CLOSEDEVICEDIALOG_EXIT ); } -/** +/*! * This dialog widget is returned to the caller + * + * @return this dialog widget */ HbPopup *EapUsernamePwdDialog::deviceDialogWidget() const { diff -r fe6b6762fccd -r 53085837e73a securitysettings/qtconfigutils/eapqtconfiginterface/src/eapqtconfiginterface_p.cpp --- a/securitysettings/qtconfigutils/eapqtconfiginterface/src/eapqtconfiginterface_p.cpp Tue Jul 06 14:18:35 2010 +0300 +++ b/securitysettings/qtconfigutils/eapqtconfiginterface/src/eapqtconfiginterface_p.cpp Wed Aug 18 09:50:56 2010 +0300 @@ -17,7 +17,7 @@ */ /* - * %version: 49 % + * %version: 52 % */ // System includes @@ -437,7 +437,9 @@ TRAPD(err, mEapTypeIf->GetConfigurationL(eapSettings)); // getEapTypeIf has set mCurrentServerEapType correctly for comparison if (err != KErrNone || eapSettings.iEAPExpandedType != mCurrentServerEapType) { - qDebug("ERROR: EapQtConfigInterfacePrivate::supportedInnerTypes - GetConfigurationL failed"); + qDebug() + << "ERROR: EapQtConfigInterfacePrivate::supportedInnerTypes - GetConfigurationL failed, code:" + << err; // clear the instance so that the next attempt starts from scratch mEapTypeIf.reset(NULL); // return empty list @@ -814,7 +816,12 @@ // check if failed or something strange happened (incorrect EAP type settings received) if (err != KErrNone || eapSettings.iEAPExpandedType != mCurrentServerEapType) { - qDebug("ERROR: EapQtConfigInterfacePrivate - readConfiguration: GetConfigurationL failed"); + qDebug() + << "ERROR: EapQtConfigInterfacePrivate - readConfiguration: GetConfigurationL failed" + << "wanted EAP:" << pluginHandle.type().eapExpandedData().toHex() + << "- got EAP vendor ID:" << eapSettings.iEAPExpandedType.GetVendorId() + << ", vendor type" << eapSettings.iEAPExpandedType.GetVendorType() << ", error code:" + << err; // clear the instance so that the next attempt starts from scratch mEapTypeIf.reset(NULL); mCurrentServerEapType = *EapExpandedTypeNone.GetType(); @@ -889,7 +896,8 @@ varValue = config.value(EapQtConfig::PasswordClear); if (varValue.type() == QVariant::Bool) { eapSettings.iPasswordExistPresent = ETrue; - eapSettings.iPasswordExist = convertToTbool(varValue.toBool()); + // eapSettings.iPasswordExist = false cleans the password from database, true does nothing + eapSettings.iPasswordExist = convertToTbool(!varValue.toBool()); qDebug() << "EapQtConfigInterfacePrivate - copyToEapSettings PasswordClear: " << varValue.toBool(); } @@ -1057,6 +1065,7 @@ QList varList = varValue.toList(); TEapExpandedType tmpEap; EapQtPluginHandle tmpHandle; + TUint err(KErrNone); for (ind = 0; ind < varList.count(); ind++) { if (varList[ind].canConvert ()) { @@ -1066,7 +1075,15 @@ tmpHandle = varList[ind].value (); tmpEap.SetValue(tmpHandle.type().eapExpandedData().data(), tmpHandle.type().eapExpandedData().length()); - eapSettings.iEnabledEncapsulatedEAPExpandedTypes.Append(tmpEap); + err = eapSettings.iEnabledEncapsulatedEAPExpandedTypes.Append(tmpEap); + if(err != KErrNone) + { + qDebug() << "ERROR: EapQtConfigInterfacePrivate::copyToEapSettings() - RArray::Append failed for inner types"; + eapSettings.iEnabledEncapsulatedEAPExpandedTypes.Reset(); + // no dynamic memory allocated for tmpEap, just continue with + // the rest of the settings; EapSettings takes care of deallocations in its destructor + break; + } qDebug() << "EapQtConfigInterfacePrivate::copyToEapSettings() - Added to InnerType: " @@ -1083,11 +1100,22 @@ // clears the ciphersuite configuration if the provided list is empty eapSettings.iCipherSuitesPresent = ETrue; + TUint err(KErrNone); for (ind = 0; ind < varCiphers.count(); ind++) { // check that the item is of correct type (int also accepted to not be too strict) if (varCiphers[ind].type() == QVariant::UInt || varCiphers[ind].type() == QVariant::Int) { - eapSettings.iCipherSuites.Append(varCiphers[ind].toUInt()); + + err = eapSettings.iCipherSuites.Append(varCiphers[ind].toUInt()); + if(err != KErrNone) + { + qDebug() << "ERROR: EapQtConfigInterfacePrivate::copyToEapSettings() - RArray::Append failed for ciphersuites"; + eapSettings.iCipherSuites.Reset(); + // continue with the rest of the settings, no dynamic + // memory allocated for varCiphers[ind].toUInt() + break; + } + qDebug( "EapQtConfigInterfacePrivate::copyToEapSettings() - CipherSuites at %d: 0x%08x", ind, varCiphers[ind].toUInt()); @@ -1236,15 +1264,21 @@ << varValue.toByteArray().toHex(); } - // EapSettings destructor takes care of deallocating the entry - certList->Append(certEntry.data()); + TUint err = certList->Append(certEntry.data()); + if (err != KErrNone) { + qDebug() << "ERROR: EapQtConfigInterfacePrivate::appendCertificateInfo()" + << "- RPointerArray::Append failed for certificate entry"; + // scoped certEntry pointer deleted automatically + // no need to touch the array, it is handled by the caller + } + else { + qDebug() << "EapQtConfigInterfacePrivate::appendCertificateInfo()" + << "- *** certificate appended to list"; + // remove the ownerhsip from scoped pointer, entry owned by the array now + (void) certEntry.take(); + } - qDebug() - << "EapQtConfigInterfacePrivate::appendCertificateInfo()" - << "- *** certificate appended to list"; - - // all ok, remove the ownerhsip from scoped pointer - (void) certEntry.take(); + // EapSettings destructor takes care of deallocating the array entries } void EapQtConfigInterfacePrivate::copyFromEapSettings(EAPSettings &eapSettings, EapQtConfig &config) @@ -1373,12 +1407,18 @@ // only enabled certificates are reported if (eapSettings.iCertificates[ind]->GetCertType() == EapCertificateEntry::EUser && eapSettings.iCertificates[ind]->GetIsEnabled() != EFalse) { - serverClientCerts.Append(eapSettings.iCertificates[ind]); + // no need to check the return value for failures, + // serverClientCerts does not own the pointed data, + // eapSettings owns and deallocates it + (void) serverClientCerts.Append(eapSettings.iCertificates[ind]); } // only enabled certificates are reported else if (eapSettings.iCertificates[ind]->GetCertType() == EapCertificateEntry::ECA && eapSettings.iCertificates[ind]->GetIsEnabled() != EFalse) { - serverCaCerts.Append(eapSettings.iCertificates[ind]); + // no need to check the return value for failures, + // serverCaCerts does not own the pointed data, + // eapSettings owns and deallocates it + (void) serverCaCerts.Append(eapSettings.iCertificates[ind]); } else { qDebug() @@ -1604,6 +1644,7 @@ // pick only the supported ones from outerHandles TEapExpandedType tmpEap; + TUint err(KErrNone); for (int ind = 0; ind < mSupportedOuterTypes.count(); ind++) { if (outerHandles.contains(mSupportedOuterTypes[ind].pluginHandle())) { @@ -1613,7 +1654,14 @@ mSupportedOuterTypes[ind].pluginHandle().type().eapExpandedData().length()); // add to mOuterEapsOn - mOuterEapsOn.Append(tmpEap); + err = mOuterEapsOn.Append(tmpEap); + if(err != KErrNone) + { + qDebug() << "ERROR: EapQtConfigInterfacePrivate - setSelectedOuterTypes RArray::Append failed"; + // reset the array, no dynamic memory allocated for tmpEap + mOuterEapsOn.Reset(); + return false; + } qDebug() << "EapQtConfigInterfacePrivate - setSelectedOuterTypes adding to enabledOuterHandles: " @@ -1625,7 +1673,7 @@ // set selection to EAP server, no need to have correct content in mOuterEapsOff, // EAP server handles it, mOuterEapsOn is only important - TUint err = mEapGsIf->SetEapMethods(mOuterEapsOn, mOuterEapsOff); + err = mEapGsIf->SetEapMethods(mOuterEapsOn, mOuterEapsOff); if (err != KErrNone) { qDebug("EapQtConfigInterfacePrivate::setSelectedOuterTypes() - SetEapMethods failed: %d", err);