Mercurial Mercurial > oss > FCL > sf > mw > accesssec / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_notifier.cpp
changeset 42 53085837e73a
parent 39 fe6b6762fccd
child 52 c23bdf5a328a
equal deleted inserted replaced
39:fe6b6762fccd 42:53085837e73a 
     9 * Initial Contributors:
 
     9 * Initial Contributors:
 
    10 * Nokia Corporation - initial contribution.
 
    10 * Nokia Corporation - initial contribution.
 
    11 *
 
    11 *
 
    12 * Contributors:
 
    12 * Contributors:
 
    13 *
 
    13 *
 
    14 * Description: EAP Auth Notitier implementation
 
    14 * Description: 
       
    15 *   EAP Authentication Notitier implementation
 
    15 *
 
    16 *
 
    16 */
 
    17 */
 
    17 
    18 
    18 /*
 
    19 /*
 
    19 * %version: 3 %
 
    20 * %version: 21 %
 
    20 */
 
    21 */
 
    21 
    22 
    22 // INCLUDE FILES
 
    23 // System include files
 
    23 #include <hb/hbcore/hbsymbianvariant.h>
 
    24 #include <hb/hbcore/hbsymbianvariant.h>
 
    24 #include <e32debug.h> 
    25 #include <e32debug.h> 
    25 #include <EapExpandedType.h>  
    26 #include <EapExpandedType.h> 
       
    27 // User include files 
    26 #include "eap_auth_notifier.h"
 
    28 #include "eap_auth_notifier.h"
 
    27 #include "eap_auth_observer.h"
 
    29 #include "eap_auth_observer.h"
 
    28 #include "eap_auth_ui_strings.h"
 
    30 #include "eap_auth_ui_strings.h"
 
    29 
    31 
    30 // CONSTANTS
 
    32 // External function prototypes
 
       
    33 
       
    34 // Local constants
 
    31 const TInt KVariableLength = 30; 
    35 const TInt KVariableLength = 30; 
    32 const TInt KDlgTypeStrLength = 100; 
    36 const TInt KDlgTypeStrLength = 100; 
    33 const TInt KMaxAuthMethodLength = 50;
 
    37 const TInt KMaxAuthMethodLength = 50;
 
    34 
    38 
    35 _LIT( KUsername, "username");
 
    39 _LIT( KUsername, "username");
 
    51 _LIT(KTypepwdexpnotedlg,"com.nokia.eap.mschapv2passwordexpirednotedialog/1.0"); 
    55 _LIT(KTypepwdexpnotedlg,"com.nokia.eap.mschapv2passwordexpirednotedialog/1.0"); 
    52 _LIT(KTypeoldpwddlg,"com.nokia.eap.mschapv2oldpassworddialog/1.0"); 
    56 _LIT(KTypeoldpwddlg,"com.nokia.eap.mschapv2oldpassworddialog/1.0"); 
    53 _LIT(KTypenewpwddlg,"com.nokia.eap.mschapv2newpassworddialog/1.0"); 
    57 _LIT(KTypenewpwddlg,"com.nokia.eap.mschapv2newpassworddialog/1.0"); 
    54 _LIT(KTypeshowprovnotsuccdlg,"com.nokia.eap.fastshowprovnotsuccessnotedialog/1.0"); 
    58 _LIT(KTypeshowprovnotsuccdlg,"com.nokia.eap.fastshowprovnotsuccessnotedialog/1.0"); 
    55 
    59 
    56 // ---------------------------------------------------------
 
    60 // ======== LOCAL FUNCTIONS ========
 
    57 // CEapAuthNotifier::CEapAuthNotifier()
 
    61 
    58 // ---------------------------------------------------------
 
    62 // ======== MEMBER FUNCTIONS ========
 
       
    63 
       
    64 // ---------------------------------------------------------------------------
 
       
    65 // Constructor
 
       
    66 // ---------------------------------------------------------------------------
 
    59 //
 
    67 //
 
    60 CEapAuthNotifier::CEapAuthNotifier( MNotificationCallback& aClient )
 
    68 CEapAuthNotifier::CEapAuthNotifier( MNotificationCallback& aClient )
 
    61     :iClient(aClient),
 
    69     :iClient(aClient),
 
    62      iDialog(NULL),
 
    70      iDialog(NULL),
 
    63      iObserver(NULL),   
    71      iObserver(NULL),   
    66     {
 
    74     {
 
    67     RDebug::Print(_L("CEapAuthNotifier::CEapAuthNotifier DLL++") );
 
    75     RDebug::Print(_L("CEapAuthNotifier::CEapAuthNotifier DLL++") );
 
    68     
    76     
    69     }
 
    77     }
 
    70 
    78 
    71 // ---------------------------------------------------------
 
    79 // ---------------------------------------------------------------------------
 
    72 // CEapAuthNotifier::~CEapAuthNotifier()
 
    80 // Destructor
 
    73 // ---------------------------------------------------------
 
    81 // ---------------------------------------------------------------------------
 
    74 //
 
    82 //
 
    75 CEapAuthNotifier::~CEapAuthNotifier()
 
    83 CEapAuthNotifier::~CEapAuthNotifier()
 
    76     {
 
    84     {
 
    77     RDebug::Print(_L("CEapAuthNotifier::~CEapAuthNotifier") );
 
    85     RDebug::Print(_L("CEapAuthNotifier::~CEapAuthNotifier") );
 
    78     
    86     
    92         {
 
   100         {
 
    93         delete iObserver;
 
   101         delete iObserver;
 
    94         }
 
   102         }
 
    95     }
 
   103     }
 
    96 
   104 
    97 // ---------------------------------------------------------
 
   105 // ---------------------------------------------------------------------------
 
    98 // CEapAuthNotifier* CEapAuthNotifier::NewL
 
   106 // Two-phased constructor
 
    99 // ---------------------------------------------------------
 
   107 // ---------------------------------------------------------------------------
 
   100 //
 
   108 //
 
   101 EXPORT_C CEapAuthNotifier* CEapAuthNotifier::NewL( 
   109 EXPORT_C CEapAuthNotifier* CEapAuthNotifier::NewL( 
   102     MNotificationCallback& aClient )
 
   110     MNotificationCallback& aClient )
 
   103     {
 
   111     {
 
   104     RDebug::Print(_L("CEapAuthNotifier::NewL"));
 
   112     RDebug::Print(_L("CEapAuthNotifier::NewL"));
 
   109     self->ConstructL();
 
   117     self->ConstructL();
 
   110     CleanupStack::Pop( self );
 
   118     CleanupStack::Pop( self );
 
   111     return self;
 
   119     return self;
 
   112     }
 
   120     }
 
   113 
   121 
   114 // ---------------------------------------------------------
 
   122 // ---------------------------------------------------------------------------
 
   115 // CEapAuthNotifier::ConstructL
 
   123 // ConstructL for the Notifier
 
   116 // ---------------------------------------------------------
 
   124 // ---------------------------------------------------------------------------
 
   117 //
 
   125 //
 
   118 void CEapAuthNotifier::ConstructL()
 
   126 void CEapAuthNotifier::ConstructL()
 
   119     {
 
   127     {
 
   120     RDebug::Print(_L("CEapAuthNotifier::ConstructL"));
 
   128     RDebug::Print(_L("CEapAuthNotifier::ConstructL"));
 
   121     //Observer is needed in order to get the user inputs
 
   129     //Observer is needed in order to get the user inputs
 
   122     iObserver = CEapAuthObserver::NewL( this ); 
   130     iObserver = CEapAuthObserver::NewL( this ); 
   123     iDialog = CHbDeviceDialogSymbian::NewL();    
   131     iDialog = CHbDeviceDialogSymbian::NewL();    
   124     }
 
   132     }
 
   125 
   133 
   126 // ---------------------------------------------------------
 
   134 // ---------------------------------------------------------------------------
 
   127 // void CEapAuthNotifier::StartL
 
   135 // Start the Notifier
 
   128 // ---------------------------------------------------------
 
   136 // ---------------------------------------------------------------------------
 
   129 //
 
   137 //
 
   130 EXPORT_C void CEapAuthNotifier::StartL( 
   138 EXPORT_C void CEapAuthNotifier::StartL( 
   131     EEapNotifierType aType,
 
   139     EEapNotifierType aType,
 
   132     TEapDialogInfo* aEapInfo, 
   140     TEapDialogInfo* aEapInfo, 
   133     TEapExpandedType& aEapType )
 
   141     TEapExpandedType& aEapType )
 
   216         {
 
   224         {
 
   217         EapNtfType.Copy(KTypemasterkeyquerydlg);
 
   225         EapNtfType.Copy(KTypemasterkeyquerydlg);
 
   218         }
 
   226         }
 
   219     else if ( aType == EEapNotifierTypeFastPacFilePwQueryDialog ) 
   227     else if ( aType == EEapNotifierTypeFastPacFilePwQueryDialog ) 
   220         {
 
   228         {
 
   221         setFastPacFileQueryPwDialogDataL( aEapInfo, map );
 
   229         SetFastPacFileQueryPwDialogDataL( aEapInfo, map );
 
   222         EapNtfType.Copy(KTypepacfilepwquerydlg);
 
   230         EapNtfType.Copy(KTypepacfilepwquerydlg);
 
   223         }
 
   231         }
 
   224     else if ( aType == EEapNotifierTypeFastStartAuthProvWaitNote )
 
   232     else if ( aType == EEapNotifierTypeFastStartAuthProvWaitNote )
 
   225         {
 
   233         {
 
   226         setFastProvWaitNoteDialogDataL( map, ETrue );
 
   234         SetFastProvWaitNoteDialogDataL( map, ETrue );
 
   227         EapNtfType.Copy(KTypeprovwaitnotedlg);
 
   235         EapNtfType.Copy(KTypeprovwaitnotedlg);
 
   228         }
 
   236         }
 
   229     else if ( aType == EEapNotifierTypeFastStartUnauthProvWaitNote )
 
   237     else if ( aType == EEapNotifierTypeFastStartUnauthProvWaitNote )
 
   230         {
 
   238         {
 
   231         setFastProvWaitNoteDialogDataL( map, EFalse );
 
   239         SetFastProvWaitNoteDialogDataL( map, EFalse );
 
   232         EapNtfType.Copy(KTypeprovwaitnotedlg);
 
   240         EapNtfType.Copy(KTypeprovwaitnotedlg);
 
   233         }   
   241         }   
   234     else if ( aType == EEapNotifierTypeMsChapV2PasswordExpiredNote )
 
   242     else if ( aType == EEapNotifierTypeMsChapV2PasswordExpiredNote )
 
   235         {
 
   243         {
 
   236         EapNtfType.Copy(KTypepwdexpnotedlg);
 
   244         EapNtfType.Copy(KTypepwdexpnotedlg);
 
   257     CleanupStack::PopAndDestroy( map ); 
   265     CleanupStack::PopAndDestroy( map ); 
   258 
   266 
   259     RDebug::Print(_L("CEapAuthNotifier::StartL: LEAVING") );
 
   267     RDebug::Print(_L("CEapAuthNotifier::StartL: LEAVING") );
 
   260     }
 
   268     }
 
   261 
   269 
   262 // ---------------------------------------------------------
 
   270 // ---------------------------------------------------------------------------
 
   263 // void CEapAuthNotifier::setFastProvWaitNoteDialogDataL
 
   271 // Set data for the EAP-FAST provisioning wait note Dialog(s)
 
   264 // ---------------------------------------------------------
 
   272 // ---------------------------------------------------------------------------
 
   265 //
 
   273 //
 
   266 void CEapAuthNotifier::setFastProvWaitNoteDialogDataL(    
   274 void CEapAuthNotifier::SetFastProvWaitNoteDialogDataL(    
   267     CHbSymbianVariantMap* aMap,
 
   275     CHbSymbianVariantMap* aMap,
 
   268     TBool aAuthProvWaitNote )
 
   276     TBool aAuthProvWaitNote )
 
   269     {
 
   277     {
 
   270     TInt error;  
   278     TInt error;  
   271     TBuf<KVariableLength> key(KFastprovwaitnote);
 
   279     TBuf<KVariableLength> key(KFastprovwaitnote);
 
   272             
   280             
   273     CHbSymbianVariant *variant = NULL;
 
   281     CHbSymbianVariant *variant = NULL;
 
   274     
   282     
   275     RDebug::Print(_L("CEapAuthNotifier::setFastProvWaitNoteDialogData: ENTERING"));    
   283     RDebug::Print(_L("CEapAuthNotifier::SetFastProvWaitNoteDialogDataL: ENTERING"));    
   276 
   284 
   277     //Create the variant data information for the plugin
 
   285     //Create the variant data information for the plugin
 
   278     variant =  CHbSymbianVariant::NewL ( &aAuthProvWaitNote, CHbSymbianVariant::EBool );
 
   286     variant =  
       
   287         CHbSymbianVariant::NewL (
 
       
   288         &aAuthProvWaitNote, CHbSymbianVariant::EBool );
 
   279     CleanupStack::PushL( variant );
 
   289     CleanupStack::PushL( variant );
 
   280     error = aMap->Add( key, variant);
 
   290     error = aMap->Add( key, variant);
 
   281     User::LeaveIfError( error );
 
   291     User::LeaveIfError( error );
 
   282     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   292     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   283     
   293     
   284     RDebug::Print(_L("CEapAuthNotifier::setFastProvWaitNoteDialogData: LEAVING") );
 
   294     RDebug::Print(_L("CEapAuthNotifier::SetFastProvWaitNoteDialogDataL: LEAVING") );
 
   285     }
 
   295     }
 
   286 
   296 
   287 // ---------------------------------------------------------
 
   297 // ---------------------------------------------------------------------------
 
   288 // void CEapAuthNotifier::setFastPacFileQueryPwDialogDataL
 
   298 // Set data for the EAP-FAST PAC file query Dialog(s)
 
   289 // ---------------------------------------------------------
 
   299 // ---------------------------------------------------------------------------
 
   290 //
 
   300 //
 
   291 void CEapAuthNotifier::setFastPacFileQueryPwDialogDataL( 
   301 void CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL( 
   292     TEapDialogInfo* aEapInfo,
 
   302     TEapDialogInfo* aEapInfo,
 
   293     CHbSymbianVariantMap* aMap )
 
   303     CHbSymbianVariantMap* aMap )
 
   294     {
 
   304     {
 
   295     TInt error;  
   305     TInt error;  
   296     TBuf<KVariableLength> key(KPacfilename);
 
   306     TBuf<KVariableLength> key(KPacfilename);
 
   297                 
   307                 
   298     CHbSymbianVariant *variant = NULL;
 
   308     CHbSymbianVariant *variant = NULL;
 
   299         
   309         
   300     RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: ENTERING"));
 
   310     RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: ENTERING"));
 
   301         
   311         
   302     if( 0 < aEapInfo->iUidata.Length() )
 
   312     if( 0 < aEapInfo->iUidata.Length() )
 
   303        {
 
   313        {
 
   304        RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: Set PAC filename"));
 
   314        RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: Set PAC filename"));
 
   305        RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata );
 
   315        RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata );
 
   306         
   316         
   307        // Create the variant data information for the plugin
 
   317        // Create the variant data information for the plugin
 
   308        variant =  CHbSymbianVariant::NewL ( &aEapInfo->iUidata, CHbSymbianVariant::EDes );
 
   318        variant =  
       
   319            CHbSymbianVariant::NewL ( 
       
   320            &aEapInfo->iUidata, CHbSymbianVariant::EDes );
 
   309        CleanupStack::PushL( variant );
 
   321        CleanupStack::PushL( variant );
 
   310        error = aMap->Add( key, variant);
 
   322        error = aMap->Add( key, variant);
 
   311        User::LeaveIfError( error );
 
   323        User::LeaveIfError( error );
 
   312        CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   324        CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   313        }     
   325        }     
   314     RDebug::Print(_L("CEapAuthNotifier::setFastPacFileQueryPwDialogData: LEAVING") );
 
   326     RDebug::Print(_L("CEapAuthNotifier::SetFastPacFileQueryPwDialogDataL: LEAVING") );
 
   315     }
 
   327     }
 
   316 
   328 
   317 // --------------------------------------------------------------
 
   329 // ---------------------------------------------------------------------------
 
   318 // void CEapAuthNotifier::SetFastInstallPacQueryDialogDataL
 
   330 // Set data for the EAP-FAST Install PAC query Dialog(s)
 
   319 // --------------------------------------------------------------
 
   331 // ---------------------------------------------------------------------------
 
   320 //
 
   332 //
 
   321 void CEapAuthNotifier::SetFastInstallPacQueryDialogDataL( 
   333 void CEapAuthNotifier::SetFastInstallPacQueryDialogDataL( 
   322     TEapDialogInfo* aEapInfo,
 
   334     TEapDialogInfo* aEapInfo,
 
   323     CHbSymbianVariantMap* aMap )
 
   335     CHbSymbianVariantMap* aMap )
 
   324     {
 
   336     {
 
   333         {
 
   345         {
 
   334         RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: Set PAC Install server name"));
 
   346         RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: Set PAC Install server name"));
 
   335         RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata );
 
   347         RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata );
 
   336     
   348     
   337         // Create the variant data information for the plugin
 
   349         // Create the variant data information for the plugin
 
   338         variant =  CHbSymbianVariant::NewL ( &aEapInfo->iUidata, CHbSymbianVariant::EDes );
 
   350         variant =  
       
   351             CHbSymbianVariant::NewL ( 
       
   352             &aEapInfo->iUidata, CHbSymbianVariant::EDes );
 
   339         CleanupStack::PushL( variant );
 
   353         CleanupStack::PushL( variant );
 
   340         error = aMap->Add( key, variant);
 
   354         error = aMap->Add( key, variant);
 
   341         User::LeaveIfError( error );
 
   355         User::LeaveIfError( error );
 
   342         CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   356         CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   343         }     
   357         }     
   344     RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: LEAVING") );
 
   358     RDebug::Print(_L("CEapAuthNotifier::SetFastInstallPacQueryDialogData: LEAVING") );
 
   345     }
 
   359     }
 
   346 
   360 
   347 // ---------------------------------------------------------
 
   361 // ---------------------------------------------------------------------------
 
   348 // void CEapAuthNotifier::SetQueryDialogDataL
 
   362 // Set data for the Challenge Query Dialog(s)
 
   349 // ---------------------------------------------------------
 
   363 // ---------------------------------------------------------------------------
 
   350 //
 
   364 //
 
   351 void CEapAuthNotifier::SetQueryDialogDataL( 
   365 void CEapAuthNotifier::SetQueryDialogDataL( 
   352     TEapDialogInfo* aEapInfo,
 
   366     TEapDialogInfo* aEapInfo,
 
   353     CHbSymbianVariantMap* aMap,
 
   367     CHbSymbianVariantMap* aMap,
 
   354     const TDesC& aAuthMethod )
 
   368     const TDesC& aAuthMethod )
 
   363     
   377     
   364     RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: Set Heading"));
 
   378     RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: Set Heading"));
 
   365     RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: aAuthMethod = %S\n"), &aAuthMethod );
 
   379     RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: aAuthMethod = %S\n"), &aAuthMethod );
 
   366     
   380     
   367     // Create the variant data information for the plugin
 
   381     // Create the variant data information for the plugin
 
   368     variant =  CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes );
 
   382     variant =  
       
   383         CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes );
 
   369     CleanupStack::PushL( variant );
 
   384     CleanupStack::PushL( variant );
 
   370     error = aMap->Add( key1, variant);
 
   385     error = aMap->Add( key1, variant);
 
   371     User::LeaveIfError( error );
 
   386     User::LeaveIfError( error );
 
   372     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   387     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   373             
   388             
   375         {
 
   390         {
 
   376         RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: Set user input message"));
 
   391         RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: Set user input message"));
 
   377         RDebug::Print(_L("CEapAuthObserver::SetQueryDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata );
 
   392         RDebug::Print(_L("CEapAuthObserver::SetQueryDialogData: aEapInfo->iUidata = %S\n"), &aEapInfo->iUidata );
 
   378     
   393     
   379         // Create the variant data information for the plugin
 
   394         // Create the variant data information for the plugin
 
   380         variant =  CHbSymbianVariant::NewL ( &aEapInfo->iUidata, CHbSymbianVariant::EDes );
 
   395         variant =  
       
   396             CHbSymbianVariant::NewL (
 
       
   397             &aEapInfo->iUidata, CHbSymbianVariant::EDes );
 
   381         CleanupStack::PushL( variant );
 
   398         CleanupStack::PushL( variant );
 
   382         error = aMap->Add( key2, variant);
 
   399         error = aMap->Add( key2, variant);
 
   383         User::LeaveIfError( error );
 
   400         User::LeaveIfError( error );
 
   384         CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   401         CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   385         }     
   402         }     
   386     RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: LEAVING") );
 
   403     RDebug::Print(_L("CEapAuthNotifier::SetQueryDialogData: LEAVING") );
 
   387     }
 
   404     }
 
   388 
   405 
   389 // ---------------------------------------------------------
 
   406 // ---------------------------------------------------------------------------
 
   390 // void CEapAuthNotifier::SetPasswordQueryDataL
 
   407 // Set data for the Password Query Dialog(s)
 
   391 // ---------------------------------------------------------
 
   408 // ---------------------------------------------------------------------------
 
   392 //
 
   409 //
 
   393 void CEapAuthNotifier::SetPasswordQueryDataL( 
   410 void CEapAuthNotifier::SetPasswordQueryDataL( 
   394     TEapExpandedType& aEapType,
 
   411     TEapExpandedType& aEapType,
 
   395     CHbSymbianVariantMap* aMap,
 
   412     CHbSymbianVariantMap* aMap,
 
   396     const TDesC& aAuthMethod )
 
   413     const TDesC& aAuthMethod )
 
   403     RDebug::Print(_L("CEapAuthNotifier::SetPasswordQueryData: ENTERING"));
 
   420     RDebug::Print(_L("CEapAuthNotifier::SetPasswordQueryData: ENTERING"));
 
   404     RDebug::Print(_L("CEapAuthNotifier::SetPasswordQueryData: aAuthMethod = %S\n"), &aAuthMethod );
 
   421     RDebug::Print(_L("CEapAuthNotifier::SetPasswordQueryData: aAuthMethod = %S\n"), &aAuthMethod );
 
   405     
   422     
   406     //Create the variant data information for the plugin
 
   423     //Create the variant data information for the plugin
 
   407     //Set authentication method 
   424     //Set authentication method 
   408     variant =  CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes );
 
   425     variant =  
       
   426         CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes );
 
   409     CleanupStack::PushL( variant );
 
   427     CleanupStack::PushL( variant );
 
   410     error = aMap->Add( key2, variant);
 
   428     error = aMap->Add( key2, variant);
 
   411     User::LeaveIfError( error );
 
   429     User::LeaveIfError( error );
 
   412     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   430     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   413     
   431     
   414     //Set EAP type
 
   432     //Set EAP type
 
   415     variant =  CHbSymbianVariant::NewL( &aEapType.GetValue(), CHbSymbianVariant::EBinary );
 
   433     variant =  
       
   434         CHbSymbianVariant::NewL(
 
       
   435         &aEapType.GetValue(), CHbSymbianVariant::EBinary );
 
   416     CleanupStack::PushL( variant );
 
   436     CleanupStack::PushL( variant );
 
   417     error = aMap->Add( key3, variant);
 
   437     error = aMap->Add( key3, variant);
 
   418     User::LeaveIfError( error );
 
   438     User::LeaveIfError( error );
 
   419     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.    
   439     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.    
   420     RDebug::Print(_L("CEapAuthNotifier::SetPasswordQueryData: LEAVING") );
 
   440     RDebug::Print(_L("CEapAuthNotifier::SetPasswordQueryData: LEAVING") );
 
   421     }
 
   441     }
 
   422 
   442 
   423 // ---------------------------------------------------------
 
   443 // ---------------------------------------------------------------------------
 
   424 // void CEapAuthNotifier::SetUsernamePasswordDataL
 
   444 // Set data for the UsernamePassword Dialog(s)
 
   425 // ---------------------------------------------------------
 
   445 // ---------------------------------------------------------------------------
 
   426 //
 
   446 //
 
   427 void CEapAuthNotifier::SetUsernamePasswordDataL( 
   447 void CEapAuthNotifier::SetUsernamePasswordDataL( 
   428     TEapDialogInfo* aEapInfo,
 
   448     TEapDialogInfo* aEapInfo,
 
   429     TEapExpandedType& aEapType,
 
   449     TEapExpandedType& aEapType,
 
   430     CHbSymbianVariantMap* aMap,
 
   450     CHbSymbianVariantMap* aMap,
 
   439     RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: ENTERING"));
 
   459     RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: ENTERING"));
 
   440     RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: aAuthMethod = %S\n"), &aAuthMethod );
 
   460     RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: aAuthMethod = %S\n"), &aAuthMethod );
 
   441     
   461     
   442     //Create the variant data information for the plugin
 
   462     //Create the variant data information for the plugin
 
   443     //Set authentication method 
   463     //Set authentication method 
   444     variant =  CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes );
 
   464     variant =  
       
   465         CHbSymbianVariant::NewL ( &aAuthMethod, CHbSymbianVariant::EDes );
 
   445     CleanupStack::PushL( variant );
 
   466     CleanupStack::PushL( variant );
 
   446     error = aMap->Add( key2, variant);
 
   467     error = aMap->Add( key2, variant);
 
   447     User::LeaveIfError( error );
 
   468     User::LeaveIfError( error );
 
   448     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   469     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   449     
   470     
   452         {
 
   473         {
 
   453         RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: Set default UNAME"));
 
   474         RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: Set default UNAME"));
 
   454         RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: iEapInfo->iUsername = %S\n"), &iEapInfo->iUsername );
 
   475         RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: iEapInfo->iUsername = %S\n"), &iEapInfo->iUsername );
 
   455     
   476     
   456         // Create the variant data information for the plugin
 
   477         // Create the variant data information for the plugin
 
   457         variant =  CHbSymbianVariant::NewL ( &aEapInfo->iUsername, CHbSymbianVariant::EDes );
 
   478         variant =  
       
   479             CHbSymbianVariant::NewL ( 
       
   480             &aEapInfo->iUsername, CHbSymbianVariant::EDes );
 
   458         CleanupStack::PushL( variant );
 
   481         CleanupStack::PushL( variant );
 
   459         error = aMap->Add( key1, variant);
 
   482         error = aMap->Add( key1, variant);
 
   460         User::LeaveIfError( error );
 
   483         User::LeaveIfError( error );
 
   461         CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   484         CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.
 
   462         }
 
   485         }
 
   463 
   486 
   464     //Set EAP type
 
   487     //Set EAP type
 
   465     variant =  CHbSymbianVariant::NewL( &aEapType.GetValue(), CHbSymbianVariant::EBinary );
 
   488     variant =  
       
   489         CHbSymbianVariant::NewL( 
       
   490         &aEapType.GetValue(), CHbSymbianVariant::EBinary );
 
   466     CleanupStack::PushL( variant );
 
   491     CleanupStack::PushL( variant );
 
   467     error = aMap->Add( key3, variant);
 
   492     error = aMap->Add( key3, variant);
 
   468     User::LeaveIfError( error );
 
   493     User::LeaveIfError( error );
 
   469     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.    
   494     CleanupStack::Pop( variant ); // map's cleanup sequence handles variant.    
   470     RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: LEAVING") );
 
   495     RDebug::Print(_L("CEapAuthNotifier::SetUsernamePasswordData: LEAVING") );
 
   471     }
 
   496     }
 
   472 
   497 
   473 // --------------------------------------------------------------------------
 
   498 // ---------------------------------------------------------------------------
 
   474 // void CEapAuthNotifier::SetSelectedUnameAndPwd( TEapDialogInfo& aEapInfo )
 
   499 // Sets the selected user name and password of the presented dialog
 
   475 // --------------------------------------------------------------------------
 
   500 // ---------------------------------------------------------------------------
 
   476 //
 
   501 //
 
   477 void CEapAuthNotifier::SetSelectedUnameAndPwd ( TEapDialogInfo& aEapInfo )
 
   502 void CEapAuthNotifier::SetSelectedUnameAndPwd ( TEapDialogInfo& aEapInfo )
 
   478     {
 
   503     {
 
   479     RDebug::Print(_L("CEapAuthNotifier::SetSelectedUnameAndPwd"));
 
   504     RDebug::Print(_L("CEapAuthNotifier::SetSelectedUnameAndPwd"));
 
   480     
   505     
   491         iEapInfo->iPassword = aEapInfo.iPassword;
 
   516         iEapInfo->iPassword = aEapInfo.iPassword;
 
   492         RDebug::Print(_L("CEapAuthNotifier::SetSelectedUnameAndPwd: iEapInfo->iPassword = %S\n"), &iEapInfo->iPassword );
 
   517         RDebug::Print(_L("CEapAuthNotifier::SetSelectedUnameAndPwd: iEapInfo->iPassword = %S\n"), &iEapInfo->iPassword );
 
   493         }    
   518         }    
   494     }
 
   519     }
 
   495 
   520 
   496 // ------------------------------------------------------------------------------
 
   521 // ---------------------------------------------------------------------------
 
   497 // void CEapAuthNotifier::SetSelectedPassword( TEapDialogInfo& aPasswordInfo )
 
   522 // Sets the selected password of the presented dialog
 
   498 // ------------------------------------------------------------------------------
 
   523 // ---------------------------------------------------------------------------
 
   499 //
 
   524 //
 
   500 void CEapAuthNotifier::SetSelectedPassword ( TEapDialogInfo& aPasswordInfo )
 
   525 void CEapAuthNotifier::SetSelectedPassword ( TEapDialogInfo& aPasswordInfo )
 
   501     {
 
   526     {
 
   502     RDebug::Print(_L("CEapAuthNotifier::SetSelectedPassword"));
 
   527     RDebug::Print(_L("CEapAuthNotifier::SetSelectedPassword"));
 
   503 
   528 
   504     iEapInfo->iPassword = aPasswordInfo.iPassword;
 
   529     iEapInfo->iPassword = aPasswordInfo.iPassword;
 
   505     RDebug::Print(_L("CEapAuthNotifier::SetSelectedPassword: iEapInfo->iPassword = %S\n"), &iEapInfo->iPassword );    
   530     RDebug::Print(_L("CEapAuthNotifier::SetSelectedPassword: iEapInfo->iPassword = %S\n"), &iEapInfo->iPassword );    
   506     }
 
   531     }
 
   507 
   532 
   508 // ---------------------------------------------------------------------------------
 
   533 // ---------------------------------------------------------------------------
 
   509 // void CEapAuthNotifier::SetSelectedOldPassword( TEapDialogInfo& aPasswordInfo )
 
   534 // Sets the selected Old password of the presented dialog
 
   510 // ---------------------------------------------------------------------------------
 
   535 // ---------------------------------------------------------------------------
 
   511 //
 
   536 //
 
   512 void CEapAuthNotifier::SetSelectedOldPassword ( TEapDialogInfo& aPasswordInfo )
 
   537 void CEapAuthNotifier::SetSelectedOldPassword ( TEapDialogInfo& aPasswordInfo )
 
   513     {
 
   538     {
 
   514     RDebug::Print(_L("CEapAuthNotifier::SetSelectedOldPassword"));
 
   539     RDebug::Print(_L("CEapAuthNotifier::SetSelectedOldPassword"));
 
   515 
   540 
   516     iEapInfo->iOldPassword = aPasswordInfo.iOldPassword;
 
   541     iEapInfo->iOldPassword = aPasswordInfo.iOldPassword;
 
   517     RDebug::Print(_L("CEapAuthNotifier::SetSelectedOldPassword: iEapInfo->iOldPassword = %S\n"), &iEapInfo->iOldPassword );    
   542     RDebug::Print(_L("CEapAuthNotifier::SetSelectedOldPassword: iEapInfo->iOldPassword = %S\n"), &iEapInfo->iOldPassword );    
   518     }
 
   543     }
 
   519 
   544 
   520 // ---------------------------------------------------------
 
   545 // ---------------------------------------------------------------------------
 
   521 // void CEapAuthNotifier::Complete( TInt aStatus )
 
   546 // The notifier is complete
 
   522 // ---------------------------------------------------------
 
   547 // ---------------------------------------------------------------------------
 
   523 //
 
   548 //
 
   524 void CEapAuthNotifier::CompleteL( TInt aStatus )
 
   549 void CEapAuthNotifier::CompleteL( TInt aStatus )
 
   525     {
 
   550     {
 
   526     RDebug::Print(_L("CEapAuthNotifier::CompleteL"));
 
   551     RDebug::Print(_L("CEapAuthNotifier::CompleteL"));
 
   527     
   552     
   530         iClient.DlgComplete(aStatus);
 
   555         iClient.DlgComplete(aStatus);
 
   531         iCompleted = ETrue;
 
   556         iCompleted = ETrue;
 
   532         }
 
   557         }
 
   533     }
 
   558     }
 
   534 
   559 
   535 // ------------------------------------------------------------
 
   560 // ---------------------------------------------------------------------------
 
   536 // void CEapAuthNotifier::Cancel()
 
   561 // Cancel() the notifier
 
   537 // ------------------------------------------------------------
 
   562 // ---------------------------------------------------------------------------
 
   538 //
 
   563 //
 
   539 EXPORT_C void CEapAuthNotifier::Cancel()
 
   564 EXPORT_C void CEapAuthNotifier::Cancel()
 
   540     {
 
   565     {
 
   541     RDebug::Print(_L("CEapAuthNotifier::Cancel"));
 
   566     RDebug::Print(_L("CEapAuthNotifier::Cancel"));
 
   542     if ( !iCompleted )
 
   567     if ( !iCompleted )
FCL/sf/mw/accesssec