diff -r 8957df7b0072 -r 098e361762d2 securitydialogs/SecUi/Src/SecQueryUi.cpp --- a/securitydialogs/SecUi/Src/SecQueryUi.cpp Mon May 03 13:20:16 2010 +0300 +++ b/securitydialogs/SecUi/Src/SecQueryUi.cpp Fri May 14 16:43:26 2010 +0300 @@ -17,16 +17,16 @@ #include "SecQueryUi.h" // CSecQueryUi // #include // SIF UI device dialog parameters -#include // CHbDeviceDialog +#include // CHbDeviceDialogSymbian #include // CHbSymbianVariantMap #include // CApaMaskedBitmap +#include #include #include #include "SecUiWait.h" // Variant map keys for notification device dialog -_LIT( KNotifDeviceDialogLiteral, "com.nokia.hb.devicenotificationdialog/1.0" ); _LIT( KNotifDeviceDialogKeyTimeOut, "timeout" ); _LIT( KNotifDeviceDialogKeyIconName, "iconName" ); _LIT( KNotifDeviceDialogKeyText, "text" ); @@ -36,10 +36,10 @@ _LIT( KNotifDeviceDialogKeyActivatedValue, "activated" ); _LIT( KNotifDeviceDialogKeyTitleTextWrapping, "titleTextWrapping" ); -const TInt KMaxNumberOfPINAttempts(3); -const TInt KLastRemainingInputAttempt(1); - -const TUid KSWInstHelpUid = { 0x101F8512 }; // TODO +const TUid KSWInstHelpUid = + { + 0x101F8512 + }; // TODO // ======== MEMBER FUNCTIONS ======== @@ -50,8 +50,8 @@ // EXPORT_C CSecQueryUi* CSecQueryUi::NewLC() { - CSecQueryUi* self = new( ELeave ) CSecQueryUi(); - CleanupStack::PushL( self ); + CSecQueryUi* self = new (ELeave) CSecQueryUi(); + CleanupStack::PushL(self); self->ConstructL(); return self; } @@ -63,11 +63,10 @@ EXPORT_C CSecQueryUi* CSecQueryUi::NewL() { CSecQueryUi* self = CSecQueryUi::NewLC(); - CleanupStack::Pop( self ); + CleanupStack::Pop(self); return self; } - // --------------------------------------------------------------------------- // CSecQueryUi::~CSecQueryUi() // --------------------------------------------------------------------------- @@ -84,54 +83,89 @@ // CSecQueryUi::InstallConfirmationQueryL() // --------------------------------------------------------------------------- // -EXPORT_C TBool CSecQueryUi::InstallConfirmationQueryL( TInt aType, RMobilePhone::TMobilePassword& password ) +EXPORT_C TBool CSecQueryUi::InstallConfirmationQueryL(TInt aType, + RMobilePhone::TMobilePassword& password) /* - const TDesC& aAppName, - const TDesC& aIconFile, const TDesC& aAppVersion, TInt aAppSize, - const TDesC& aAppDetails ) */ + const TDesC& aAppName, + const TDesC& aIconFile, const TDesC& aAppVersion, TInt aAppSize, + const TDesC& aAppDetails ) */ { - - RDEBUG( "This should never be called. Obsolete", 0 ); - return KErrAbort ; + // this is never used. Kept as a reference + RDEBUG("This should never be called. Obsolete aType", aType); + return KErrAbort; } // --------------------------------------------------------------------------- // CSecQueryUi::SecQueryDialog() // --------------------------------------------------------------------------- // -EXPORT_C TInt CSecQueryUi::SecQueryDialog(const TDesC& aCaption, TDes& aDataText, TInt aMinLength,TInt aMaxLength,TInt aMode) +EXPORT_C TInt CSecQueryUi::SecQueryDialog(const TDesC& aCaption, + TDes& aDataText, TInt aMinLength, TInt aMaxLength, TInt aMode) { - RDEBUG( "aCaption", 0 ); - RDebug::Print( aCaption ); - RDEBUG( "aMode", aMode ); + RDEBUG("aCaption", 0); + RDebug::Print(aCaption); + RDEBUG("aMode", aMode); + TInt secUiOriginatedQuery(ESecurityUIsSecUIOriginatedUninitialized); + TInt err = RProperty::Get(KPSUidSecurityUIs, + KSecurityUIsSecUIOriginatedQuery, secUiOriginatedQuery); + RDEBUG("secUiOriginatedQuery", secUiOriginatedQuery); + if (secUiOriginatedQuery != ESecurityUIsSecUIOriginatedUninitialized) + { + // The query is already shown. This is valid for ESecurityUIsSecUIOriginated, and maybe for ESecurityUIsETelAPIOriginated + // For ESecurityUIsSystemLockOriginated it means that the "lock" dialog is already present. + // What to do? Can't dismiss the dialog because it's not owned. Can't device-unlock without asking code. Only can disable keyguard + RDEBUG("!!!! warning: secUiOriginatedQuery", secUiOriginatedQuery); + } + else + { + // set only if not set + err = RProperty::Set(KPSUidSecurityUIs, + KSecurityUIsSecUIOriginatedQuery, + ESecurityUIsETelAPIOriginated); + RDEBUG("setting secUiOriginatedQuery", ESecurityUIsETelAPIOriginated); + } - ClearParamsAndSetNoteTypeL( aMode ); - AddParamL( _L("KSecQueryUiApplicationName"), aCaption ); + ClearParamsAndSetNoteTypeL(aMode); + AddParamL(_L("KSecQueryUiApplicationName"), aCaption); - _LIT(KTitle, "title"); + _LIT(KTitle, "title"); // _LIT(KTitleValue1, "Enter PIN"); - AddParamL( KTitle, aCaption ); - AddParamL( _L("MinLength"), aMinLength ); - AddParamL( _L("MaxLength"), aMaxLength ); - - _LIT( KCodeTop, "codeTop" ); _LIT( KCodeTopValue, "codeTop" ); - AddParamL( KCodeTop, KCodeTopValue ); + AddParamL(KTitle, aCaption); + AddParamL(_L("MinLength"), aMinLength); + AddParamL(_L("MaxLength"), aMaxLength); + + _LIT(KCodeTop, "codeTop"); + _LIT(KCodeTopValue, "codeTop"); + AddParamL(KCodeTop, KCodeTopValue); - if( aCaption.Find(_L("|"))>0 ) - { - RDEBUG( "codeBottom aMode", aMode ); - _LIT( KCodeBottom, "codeBottom" ); _LIT( KCodeBottomValue, "codeBottom" ); - AddParamL( KCodeBottom, KCodeBottomValue ); - } + if (aCaption.Find(_L("|")) > 0) + { + RDEBUG("codeBottom aMode", aMode); + _LIT(KCodeBottom, "codeBottom"); + _LIT(KCodeBottomValue, "codeBottom"); + AddParamL(KCodeBottom, KCodeBottomValue); + } + if (aDataText.Length() > 0) + { + RDEBUG("aDataText", 1); + _LIT(KDefaultCode, "DefaultCode"); + AddParamL(KDefaultCode, aDataText); + } - RDEBUG( "0", 0 ); - DisplayDeviceDialogL(); - TInt error = WaitUntilDeviceDialogClosed(); - RDEBUG( "error", error ); - User::LeaveIfError( error ); + RDEBUG("0", 0); + DisplayDeviceDialogL(); + TInt error = WaitUntilDeviceDialogClosed(); + RDEBUG("error", error); + User::LeaveIfError(error); aDataText.Copy(iPassword); - RDEBUG( "iReturnValue", iReturnValue ); + + err = RProperty::Set(KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery, + ESecurityUIsSecUIOriginatedUninitialized); + RDEBUG("clearing secUiOriginatedQuery", + ESecurityUIsSecUIOriginatedUninitialized); + + RDEBUG("iReturnValue", iReturnValue); return iReturnValue; } @@ -139,22 +173,24 @@ // CSecQueryUi::DisplayInformationNoteL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::DisplayInformationNoteL( const TDesC& aText ) +EXPORT_C void CSecQueryUi::DisplayInformationNoteL(const TDesC& aText) { + // this is never used. Kept as a reference + RDEBUG("This should never be called. Obsolete", 0); /* - ClearParamsAndSetNoteTypeL( SecQueryUiInformationNote ); - AddParamL( KNotifDeviceDialogKeyText, aText ); - AddParamL( KNotifDeviceDialogKeyTimeOut, 0 ); - iDeviceDialog->Show( KNotifDeviceDialogLiteral, *iVariantMap, this ); - User::LeaveIfError( WaitUntilDeviceDialogClosed() ); - */ + ClearParamsAndSetNoteTypeL( SecQueryUiInformationNote ); + AddParamL( KNotifDeviceDialogKeyText, aText ); + AddParamL( KNotifDeviceDialogKeyTimeOut, 0 ); + iDeviceDialog->Show( KNotifDeviceDialogLiteral, *iVariantMap, this ); + User::LeaveIfError( WaitUntilDeviceDialogClosed() ); + */ } // --------------------------------------------------------------------------- // CSecQueryUi::DisplayWarningNoteL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::DisplayWarningNoteL( const TDesC& aText ) +EXPORT_C void CSecQueryUi::DisplayWarningNoteL(const TDesC& aText) { } @@ -162,7 +198,7 @@ // CSecQueryUi::DisplayErrorNoteL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::DisplayErrorNoteL( const TDesC& aText ) +EXPORT_C void CSecQueryUi::DisplayErrorNoteL(const TDesC& aText) { } @@ -170,7 +206,7 @@ // CSecQueryUi::DisplayPermanentNoteL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::DisplayPermanentNoteL( const TDesC& aText ) +EXPORT_C void CSecQueryUi::DisplayPermanentNoteL(const TDesC& aText) { } @@ -186,26 +222,27 @@ // CSecQueryUi::DisplayProgressNoteL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::DisplayProgressNoteL( const TDesC& aText, TInt aFinalValue ) +EXPORT_C void CSecQueryUi::DisplayProgressNoteL(const TDesC& aText, + TInt aFinalValue) { -/* - ClearParamsAndSetNoteTypeL( ESecQueryUiProgressNoteType ); - AddParamL( KSecQueryUiProgressNoteText, aText ); - AddParamL( KSecQueryUiProgressNoteFinalValue, aFinalValue ); - DisplayDeviceDialogL(); -*/ } + /* + ClearParamsAndSetNoteTypeL( ESecQueryUiProgressNoteType ); + AddParamL( KSecQueryUiProgressNoteText, aText ); + AddParamL( KSecQueryUiProgressNoteFinalValue, aFinalValue ); + DisplayDeviceDialogL(); + */} // --------------------------------------------------------------------------- // CSecQueryUi::UpdateProgressNoteValueL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::UpdateProgressNoteValueL( TInt aNewValue ) +EXPORT_C void CSecQueryUi::UpdateProgressNoteValueL(TInt aNewValue) { -/* - ClearParamsAndSetNoteTypeL( ESecQueryUiProgressNoteType ); - AddParamL( KSecQueryUiProgressNoteValue, aNewValue ); - DisplayDeviceDialogL(); -*/ } + /* + ClearParamsAndSetNoteTypeL( ESecQueryUiProgressNoteType ); + AddParamL( KSecQueryUiProgressNoteValue, aNewValue ); + DisplayDeviceDialogL(); + */} // --------------------------------------------------------------------------- // CSecQueryUi::CloseProgressNoteL() @@ -219,8 +256,8 @@ // CSecQueryUi::DisplayWaitNoteL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::DisplayWaitNoteL( const TDesC& aText, - TRequestStatus& aStatus ) +EXPORT_C void CSecQueryUi::DisplayWaitNoteL(const TDesC& aText, + TRequestStatus& aStatus) { } @@ -236,7 +273,8 @@ // CSecQueryUi::LaunchHelpL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::LaunchHelpL( const TDesC& aContext, const TUid& aUid ) +EXPORT_C void CSecQueryUi::LaunchHelpL(const TDesC& aContext, + const TUid& aUid) { } @@ -244,9 +282,9 @@ // CSecQueryUi::LaunchHelpL() // --------------------------------------------------------------------------- // -EXPORT_C void CSecQueryUi::LaunchHelpL( const TDesC& aContext ) +EXPORT_C void CSecQueryUi::LaunchHelpL(const TDesC& aContext) { - LaunchHelpL( aContext, KSWInstHelpUid ); + LaunchHelpL(aContext, KSWInstHelpUid); } // --------------------------------------------------------------------------- @@ -255,13 +293,13 @@ // void CSecQueryUi::DoCancel() { - RDEBUG( "0", 0 ); - if( iWait && iWait->IsStarted() && iWait->CanStopNow() ) + RDEBUG("0", 0); + if (iWait && iWait->IsStarted() && iWait->CanStopNow()) { iCompletionCode = KErrCancel; iWait->AsyncStop(); } - RDEBUG( "0", 0 ); + RDEBUG("0", 0); } // --------------------------------------------------------------------------- @@ -270,163 +308,169 @@ // void CSecQueryUi::RunL() { - RDEBUG( "0", 0 ); - if( iWait ) + RDEBUG("0", 0); + if (iWait) { iWait->AsyncStop(); } - RDEBUG( "0", 0 ); + RDEBUG("0", 0); } // --------------------------------------------------------------------------- // CSecQueryUi::DataReceived() // --------------------------------------------------------------------------- // -void CSecQueryUi::DataReceived( CHbSymbianVariantMap& aData ) +void CSecQueryUi::DataReceived(CHbSymbianVariantMap& aData) { - RDEBUG( "0", 0 ); - const CHbSymbianVariant* acceptedVariant = aData.Get( _L("accepted") ); // KSecQueryUiQueryAccepted - RDEBUG( "0", 0 ); - if( acceptedVariant ) + RDEBUG("0", 0); + const CHbSymbianVariant* acceptedVariant = aData.Get(_L("accepted")); // KSecQueryUiQueryAccepted + RDEBUG("0", 0); + if (acceptedVariant) { - RDEBUG( "0", 0 ); - TInt* acceptedValue = acceptedVariant->Value(); - RDEBUG( "acceptedValue", acceptedValue ); - RDEBUG( "*acceptedValue", *acceptedValue ); - if( acceptedValue ) + RDEBUG("0", 0); + TInt* acceptedValue = acceptedVariant->Value (); + RDEBUG("acceptedValue", acceptedValue); + RDEBUG("*acceptedValue", *acceptedValue); + if (acceptedValue) { iReturnValue = *acceptedValue; } } - const CHbSymbianVariant* acceptedVariantTop = aData.Get( _L("codeTop") ); // KSecQueryUiQueryAccepted - RDEBUG( "0", 0 ); - if( acceptedVariantTop ) + const CHbSymbianVariant* acceptedVariantTop = aData.Get(_L("codeTop")); // KSecQueryUiQueryAccepted + RDEBUG("0", 0); + if (acceptedVariantTop) { - TPtrC acceptedValueTop = *acceptedVariantTop->Value(); - RDEBUG( "acceptedValueTop", 0 ); - RDebug::Print( acceptedValueTop ); - iPassword.Copy(acceptedValueTop); - - if(iReturnValue == KErrCompletion ) // the user didn't OK. It was send automatically because validating new lock code - { - _LIT( KInvalidNewLockCode, "invalidNewLockCode" ); - _LIT( KInvalidNewLockCode0, "invalidNewLockCode#0" ); - _LIT( KInvalidNewLockCode1, "invalidNewLockCode#1" ); - _LIT( KInvalidNewLockCode2, "invalidNewLockCode#2" ); - AddParamL( KInvalidNewLockCode, KInvalidNewLockCode0 ); // for starter + TPtrC acceptedValueTop = *acceptedVariantTop->Value (); + RDEBUG("acceptedValueTop", 0); + RDebug::Print(acceptedValueTop); + iPassword.Copy(acceptedValueTop); + + if (iReturnValue == KErrCompletion) // the user didn't OK. It was send automatically because validating new lock code through TARM + { + _LIT(KInvalidNewLockCode, "invalidNewLockCode"); + _LIT(KInvalidNewLockCode0, "invalidNewLockCode#0"); + _LIT(KInvalidNewLockCode1, "invalidNewLockCode#1"); + _LIT(KInvalidNewLockCode2, "invalidNewLockCode#2"); + AddParamL(KInvalidNewLockCode, KInvalidNewLockCode0); // for starter RSCPClient scpClient; TSCPSecCode newCode; - newCode.Copy( acceptedValueTop ); - RDEBUG( "scpClient.Connect", 0 ); - if ( scpClient.Connect() == KErrNone ) + newCode.Copy(acceptedValueTop); + RDEBUG("scpClient.Connect", 0); + if (scpClient.Connect() == KErrNone) { /* - RArray aFailedPolicies; - TDevicelockPolicies failedPolicy; - TInt retLockcode = KErrNone; - RDEBUG( "scpClient.VerifyNewLockcodeAgainstPolicies", 0 ); - retLockcode = scpClient.VerifyNewLockcodeAgainstPolicies( newCode, aFailedPolicies ); - RDEBUG( "retLockcode", retLockcode ); - RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() ); - for(TInt i=0; i KInvalidNewLockCodeX; KInvalidNewLockCodeX.Zero(); KInvalidNewLockCodeX.Append(_L("invalidNewLockCode")); KInvalidNewLockCodeX.Append(_L("#")); - KInvalidNewLockCodeX.AppendNum(failedPolicy); - AddParamL( KInvalidNewLockCode, KInvalidNewLockCodeX ); - } - */ + RArray aFailedPolicies; + TDevicelockPolicies failedPolicy; + TInt retLockcode = KErrNone; + RDEBUG( "scpClient.VerifyNewLockcodeAgainstPolicies", 0 ); + retLockcode = scpClient.VerifyNewLockcodeAgainstPolicies( newCode, aFailedPolicies ); + RDEBUG( "retLockcode", retLockcode ); + RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() ); + for(TInt i=0; i KInvalidNewLockCodeX; KInvalidNewLockCodeX.Zero(); KInvalidNewLockCodeX.Append(_L("invalidNewLockCode")); KInvalidNewLockCodeX.Append(_L("#")); + KInvalidNewLockCodeX.AppendNum(failedPolicy); + AddParamL( KInvalidNewLockCode, KInvalidNewLockCodeX ); + } + */ + // TODO this should be able to modify MinLenght, MaxLenght scpClient.Close(); - } - RDEBUG( "iDeviceDialog->Update", 0 ); - iDeviceDialog->Update( *iVariantMap ); - } // KErrCompletion + } + RDEBUG("iDeviceDialog->Update", 0); + iDeviceDialog->Update(*iVariantMap); + } // KErrCompletion + + if (acceptedValueTop.Length() <= 4) // TODO store aMinLenght and check it here, instead of "4" + { + RDEBUG("CPhCltEmergencyCall", 0); + CPhCltEmergencyCall* emergencyCall = CPhCltEmergencyCall::NewL( + NULL); + RDEBUG("PushL", 0); + CleanupStack::PushL(emergencyCall); + TPhCltEmergencyNumber emNumber; + + // this relies on the fact that emergency has 3 digits, and password needs at least 4 + TBool isEmergency(EFalse); + RDEBUG("calling IsEmergencyPhoneNumber", 0); + TInt error = emergencyCall->IsEmergencyPhoneNumber( + acceptedValueTop, isEmergency); + RDEBUG("error", error); + RDEBUG("emNumber", 0); - if(acceptedValueTop.Length()<=4) // TODO store aMinLenght and check it here, instead of "4" - { - RDEBUG( "CPhCltEmergencyCall", 0 ); - CPhCltEmergencyCall* emergencyCall = CPhCltEmergencyCall::NewL( NULL ); - RDEBUG( "PushL", 0 ); - CleanupStack::PushL( emergencyCall ); - TPhCltEmergencyNumber emNumber; - - // this relies on the fact that emergency has 3 digits, and password needs at least 4 - TBool isEmergency( EFalse ); - RDEBUG( "calling IsEmergencyPhoneNumber", 0 ); - TInt error = emergencyCall->IsEmergencyPhoneNumber( acceptedValueTop, isEmergency ); - RDEBUG( "error", error ); - RDEBUG( "emNumber", 0 ); - - RDEBUG( "isEmergency", isEmergency ); - #ifdef __WINS__ - RDEBUG( "__WINS__ checking", 0 ); - if(!acceptedValueTop.CompareF(_L("112")) || !acceptedValueTop.CompareF(_L("911")) || !acceptedValueTop.CompareF(_L("555")) ) - { - isEmergency = ETrue; - error = KErrNone; - RDEBUG( "__WINS__ isEmergency", isEmergency ); - } - #endif - - if ( !error ) // oddly enough, missing capabilities also gives KErrNone - { - if(iReturnValue == KErrAbort ) // the user didn't OK. It was send automatically because short code - { - _LIT( KEmergency, "emergency" ); _LIT( KEmergencyValueYes, "emergencyYes" ); _LIT( KEmergencyValueNo, "emergencyNo" ); - if(isEmergency) - { - RDEBUG( "KEmergencyValueYes", 1 ); - AddParamL( KEmergency, KEmergencyValueYes ); - } - else - { - RDEBUG( "KEmergencyValueNo", 0 ); - AddParamL( KEmergency, KEmergencyValueNo ); - } - iDeviceDialog->Update( *iVariantMap ); - } - else if(iReturnValue == KErrNone ) - { // user pressed Call and number is valid - if(isEmergency) - { - RDEBUG( "DialEmergencyCallL", isEmergency ); - emergencyCall->DialEmergencyCallL( emNumber ); - iReturnValue = KErrAbort; // this means emergency call - } - } - } // if !error - RDEBUG( "0", 0 ); - CleanupStack::PopAndDestroy( emergencyCall ); - } // lenght<3 - } // acceptedVariantTop - RDEBUG( "iReturnValue", iReturnValue ); + RDEBUG("isEmergency", isEmergency); +#ifdef __WINS__ + RDEBUG( "__WINS__ checking", 0 ); + if(!acceptedValueTop.CompareF(_L("112")) || !acceptedValueTop.CompareF(_L("911")) || !acceptedValueTop.CompareF(_L("555")) ) + { + isEmergency = ETrue; + error = KErrNone; + RDEBUG( "__WINS__ isEmergency", isEmergency ); + } +#endif + + if (!error) // oddly enough, missing capabilities also gives KErrNone + { + if (iReturnValue == KErrAbort) // the user didn't OK. It was send automatically because short code + { + _LIT(KEmergency, "emergency"); + _LIT(KEmergencyValueYes, "emergencyYes"); + _LIT(KEmergencyValueNo, "emergencyNo"); + if (isEmergency) + { + RDEBUG("KEmergencyValueYes", 1); + AddParamL(KEmergency, KEmergencyValueYes); + } + else + { + RDEBUG("KEmergencyValueNo", 0); + AddParamL(KEmergency, KEmergencyValueNo); + } + iDeviceDialog->Update(*iVariantMap); + } + else if (iReturnValue == KErrNone) + { // user pressed Call and number is valid + if (isEmergency) + { + RDEBUG("DialEmergencyCallL", isEmergency); + emergencyCall->DialEmergencyCallL(emNumber); + iReturnValue = KErrAbort; // this means emergency call + } + } + } // if !error + RDEBUG("0", 0); + CleanupStack::PopAndDestroy(emergencyCall); + } // lenght<3 + } // acceptedVariantTop + RDEBUG("iReturnValue", iReturnValue); } // --------------------------------------------------------------------------- // CSecQueryUi::DeviceDialogClosed() // --------------------------------------------------------------------------- // -void CSecQueryUi::DeviceDialogClosed( TInt aCompletionCode ) +void CSecQueryUi::DeviceDialogClosed(TInt aCompletionCode) { - RDEBUG( "aCompletionCode", aCompletionCode ); + RDEBUG("aCompletionCode", aCompletionCode); iCompletionCode = aCompletionCode; iIsDisplayingDialog = EFalse; - TRequestStatus* status( &iStatus ); - RDEBUG( "0", 0 ); - User::RequestComplete( status, KErrNone ); - RDEBUG( "0", 0 ); + TRequestStatus* status(&iStatus); + RDEBUG("0", 0); + User::RequestComplete(status, KErrNone); + RDEBUG("0", 0); } // --------------------------------------------------------------------------- // CSecQueryUi::CSecQueryUi() // --------------------------------------------------------------------------- // -CSecQueryUi::CSecQueryUi() : CActive( CActive::EPriorityStandard ) +CSecQueryUi::CSecQueryUi() : + CActive(CActive::EPriorityStandard) { - RDEBUG( "0", 0 ); - CActiveScheduler::Add( this ); + RDEBUG("0", 0); + CActiveScheduler::Add(this); } // --------------------------------------------------------------------------- @@ -435,8 +479,8 @@ // void CSecQueryUi::ConstructL() { - RDEBUG( "0", 0 ); - iWait = new( ELeave ) CActiveSchedulerWait; + RDEBUG("0", 0); + iWait = new (ELeave) CActiveSchedulerWait; // iDeviceDialog is allocated later, first call of DisplayDeviceDialogL() } @@ -446,8 +490,8 @@ // void CSecQueryUi::ClearParamsL() { - RDEBUG( "0", 0 ); - if( iVariantMap ) + RDEBUG("0", 0); + if (iVariantMap) { delete iVariantMap; iVariantMap = NULL; @@ -459,41 +503,41 @@ // CSecQueryUi::ClearParamsAndSetNoteTypeL() // --------------------------------------------------------------------------- // -void CSecQueryUi::ClearParamsAndSetNoteTypeL( TInt aType ) +void CSecQueryUi::ClearParamsAndSetNoteTypeL(TInt aType) { - RDEBUG( "aType", aType ); + RDEBUG("aType", aType); ClearParamsL(); - AddParamL( _L("type"), aType ); + AddParamL(_L("type"), aType); } // --------------------------------------------------------------------------- // CSecQueryUi::AddParamL() // --------------------------------------------------------------------------- // -void CSecQueryUi::AddParamL( const TDesC& aKey, TInt aValue ) +void CSecQueryUi::AddParamL(const TDesC& aKey, TInt aValue) { - RDEBUG( "aValue", aValue ); + RDEBUG("aValue", aValue); CHbSymbianVariant* variant = NULL; - variant = CHbSymbianVariant::NewL( &aValue, CHbSymbianVariant::EInt ); - iVariantMap->Add( aKey, variant ); + variant = CHbSymbianVariant::NewL(&aValue, CHbSymbianVariant::EInt); + iVariantMap->Add(aKey, variant); } // --------------------------------------------------------------------------- // CSecQueryUi::AddParamL() // --------------------------------------------------------------------------- // -void CSecQueryUi::AddParamL( const TDesC& aKey, const TDesC& aValue ) +void CSecQueryUi::AddParamL(const TDesC& aKey, const TDesC& aValue) { - RDEBUG( "0", 0 ); + RDEBUG("0", 0); CHbSymbianVariant* variant = NULL; - variant = CHbSymbianVariant::NewL( &aValue, CHbSymbianVariant::EDes ); - iVariantMap->Add( aKey, variant ); + variant = CHbSymbianVariant::NewL(&aValue, CHbSymbianVariant::EDes); + iVariantMap->Add(aKey, variant); } -TInt strlen( const char* aStr ) +TInt strlen(const char* aStr) { TInt len = 0; - while( *aStr++ != 0 ) + while (*aStr++ != 0) ++len; return len; } @@ -504,25 +548,25 @@ // void CSecQueryUi::DisplayDeviceDialogL() { - RDEBUG( "0", 0 ); - if( iDeviceDialog && iIsDisplayingDialog ) + RDEBUG("0", 0); + if (iDeviceDialog && iIsDisplayingDialog) { - iDeviceDialog->Update( *iVariantMap ); + iDeviceDialog->Update(*iVariantMap); } else { - if( !iDeviceDialog ) + if (!iDeviceDialog) { - iDeviceDialog = CHbDeviceDialog::NewL(); + iDeviceDialog = CHbDeviceDialogSymbian::NewL(); } - _LIT( KSecQueryUiDeviceDialog, "com.nokia.secuinotificationdialog/1.0" ); - RDEBUG( "Show", 0 ); - iDeviceDialog->Show( KSecQueryUiDeviceDialog, *iVariantMap, this ); - RDEBUG( "iIsDisplayingDialog", iIsDisplayingDialog ); + _LIT(KSecQueryUiDeviceDialog, "com.nokia.secuinotificationdialog/1.0"); + RDEBUG("Show", 0); + iDeviceDialog->Show(KSecQueryUiDeviceDialog, *iVariantMap, this); + RDEBUG("iIsDisplayingDialog", iIsDisplayingDialog); iIsDisplayingDialog = ETrue; - RDEBUG( "iIsDisplayingDialog", iIsDisplayingDialog ); + RDEBUG("iIsDisplayingDialog", iIsDisplayingDialog); } - RDEBUG( "0", 0 ); + RDEBUG("0", 0); } // --------------------------------------------------------------------------- @@ -531,18 +575,18 @@ // TInt CSecQueryUi::WaitUntilDeviceDialogClosed() { - RDEBUG( "0", 0 ); + RDEBUG("0", 0); iCompletionCode = KErrInUse; iReturnValue = KErrUnknown; - if( !IsActive() && iWait && !iWait->IsStarted() ) + if (!IsActive() && iWait && !iWait->IsStarted()) { iStatus = KRequestPending; SetActive(); - RDEBUG( "Start", 0 ); + RDEBUG("Start", 0); iWait->Start(); - RDEBUG( "Started", 1 ); + RDEBUG("Started", 1); } - RDEBUG( "iCompletionCode", iCompletionCode ); + RDEBUG("iCompletionCode", iCompletionCode); return iCompletionCode; }