FCL/sf/mw/securitysrv: comparison securitydialogs/SecUi/Src/SecUiSecuritySettings.cpp

equal deleted inserted replaced

-:6b63ca65093a
+:aad866c37519
 */
 #include <etelmm.h>
 #include <exterror.h>
 #include <textresolver.h>
-#include <SecUi.rsg>
 #include <aknnotedialog.h>
 #include <mmtsy_names.h>
 #include <centralrepository.h>
 #include <gsmerror.h>
 #include <SCPClient.h>
 #include <StringLoader.h>
 #include <e32property.h>
 #include <PSVariables.h>   // Property values
 #include <securityuisprivatepskeys.h>
 #include <startupdomainpskeys.h>
+#include "SecUi.h"
 #include "secuisecuritysettings.h"
-#include "SecUiAutoLockSettingPage.h"
 #include "secui.hrh"
 #include "secuisecurityhandler.h"
 #include "secuicodequerydialog.h"
 #include "SecUiWait.h"
-#ifdef RD_REMOTELOCK
 #include <aknnotewrappers.h>
 #include <StringLoader.h>
 #include <RemoteLockSettings.h>
-#include "SecUiRemoteLockSettingPage.h"
-#endif // RD_REMOTELOCK
 #include <featmgr.h>
 #include "SecQueryUi.h"
 #include <hb/hbwidgets/hbdevicemessageboxsymbian.h>
 /*****************************************************
 *    Series 60 Customer / TSY
 *    Needs customer TSY implementation
 *****************************************************/
+		RDEBUG("0", 0);
 TInt err(KErrGeneral);
 TInt thisTry(0);
 iWait = CWait::NewL();
 RTelServer::TPhoneInfo PhoneInfo;
 /* All server connections are tried to be made KTriesToConnectServer times because occasional
 fails on connections are possible, at least on some servers */
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ConstructL()"));
-#endif
 FeatureManager::InitializeLibL();
 // connect to ETel server
 while ((err = iServer.Connect()) != KErrNone && (thisTry++)
 <= KTriesToConnectServer)
 delete iSecurityHandler;
 // Cancel active requests
 if (iWait->IsActive())
 {
-#if defined(_DEBUG)
+				RDEBUG("CancelAsyncRequest", 0);
-RDebug::Print(_L("(SECUI)CManualSecuritySettings::~CSecuritySettings() CANCEL REQ"));
-#endif
 iPhone.CancelAsyncRequest(iWait->GetRequestType());
 switch (iWait->GetRequestType())
 { //inform query that it has beeen canceled
 case EMobilePhoneSetLockSetting:
 {
 TInt retValue( KErrNone );
 		RDEBUG("aRemoteLockStatus", aRemoteLockStatus);
 		RDEBUG("aAutoLockPeriod", aAutoLockPeriod);
-TInt currentItem( 0 );
 if ( aRemoteLockStatus )
 {
-currentItem = KRemoteLockSettingItemOn;
-}
-else
-{
-currentItem = KRemoteLockSettingItemOff;
-}
-		RDEBUG("currentItem", currentItem);
-if ( currentItem == KRemoteLockSettingItemOn )
-{
-				RDEBUG("KRemoteLockSettingItemOn", KRemoteLockSettingItemOn);
 aRemoteLockStatus = ETrue;
 // If user wishes to enable remote lock
 // a new remote lock code is required.
 // RemoteLockCodeQueryL also
 retValue = RemoteLockCodeQueryL( aRemoteLockCode );
 }
-else if ( currentItem == KRemoteLockSettingItemOff )
+else
 {
-				RDEBUG("KRemoteLockSettingItemOff", KRemoteLockSettingItemOff);
 aRemoteLockStatus = EFalse;
 retValue = KErrNone;
 				// TODO this should calculate aAutoLockPeriod itself, and not trust the input
 // Check whether AutoLock is enabled (timeout value greater
 // ----------------------------------------------------------
 // CSecuritySettings::RemoteLockCodeQueryL()
 // Pops up remote lock code query. Requires user to enter a new remote lock
 // code (RemoteMsg) twice and if they match enables the domestic OS device lock (which as
 // a side effect pops up security code query).
+// Note: if the RemoteMsg is cancelled, nevertheless the lock is activated. This is done because the code is askedirst, and the only way to do so is by enabling the lock.
+// This is not a problem, because:
+// a) first the RemoteMsg is enable, and this function is used to change it
+// b) if lock was disabled, the "change RemoteMsg" menu is not available.
 // ----------------------------------------------------------
 // no qtdone
 TInt CSecuritySettings::RemoteLockCodeQueryL(TDes& aRemoteLockCode)
 {
-#ifdef RD_REMOTELOCK
 TInt retValue( KErrNone );
+// This is done because lock-code needs to be asked first.
+// Enable lock setting in domestic OS. It is safe to enable the
+// lock setting since RemoteLock API requires remote locking to
+// be enabled when changing or setting the remote lock message.
+retValue = RemoteLockSetLockSettingL( ETrue );
 		RDEBUG( "retValue", retValue );
+		if (retValue != KErrNone)
+return retValue;
 aRemoteLockCode.Zero();
 TInt queryAccepted = KErrCancel;
 queryAccepted = KErrCancel;
 CSecQueryUi * iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 delete iSecQueryUi;
 if (queryAccepted != KErrNone)
 return KErrAbort;
-		// TODO it should ask first for the code, and _later_ for the RemoteMsg
+// Check that the new remote lock code doesn't match the security code of the device.
+RMobilePhone::TMobilePhoneSecurityCode secCodeType = RMobilePhone::ESecurityCodePhonePassword;
-// ----- Check against security code ------------------------------
-// Check that the new remote lock code doesn't match the security
-// code of the device.
-RMobilePhone::TMobilePhoneSecurityCode secCodeType;
-secCodeType = RMobilePhone::ESecurityCodePhonePassword;
 RMobilePhone::TMobilePassword securityCode;
 RMobilePhone::TMobilePassword unblockCode; // Required here only as a dummy parameter
-						RDEBUG( "RMobilePhone::KMaxMobilePasswordSize", RMobilePhone::KMaxMobilePasswordSize );
 securityCode = aRemoteLockCode;
+								RDEBUG( "EMobilePhoneVerifySecurityCode", EMobilePhoneVerifySecurityCode );
 iWait->SetRequestType( EMobilePhoneVerifySecurityCode );
 RDEBUG( "VerifySecurityCode", 0 );
 iPhone.VerifySecurityCode( iWait->iStatus, secCodeType, securityCode, unblockCode );
 RDEBUG( "WaitForRequestL", 0 );
 TInt res = iWait->WaitForRequestL();
 RDEBUG( "WaitForRequestL res", res );
 #ifdef __WINS__
 if (res == KErrNotSupported || res == KErrTimedOut)
-res = KErrNone;
+res = 0xffffec50;	// TODO this means KErrGsm0707IncorrectPassword = incorrect code
 #endif
-if(res != KErrNone)
+								RDEBUG( "KErrGsm0707IncorrectPassword", KErrGsm0707IncorrectPassword );
+if(res == KErrNone)
 {
-		                // The remote lock code matches the security code
+// The message is also valid as a lock-code, this means that
+		                // remote lock code matches the security code
 		                // and that is not allowed
-		                RDEBUG( "res", res );
+		                RDEBUG( "return KErrCancel because msg matches code", KErrCancel );
-		                return res;
+		                ShowResultNoteL(R_REMOTELOCK_INVALID_CODE, CAknNoteDialog::EErrorTone);
+		                return KErrCancel;
 }
-// ----- Enable DOS device lock (Security code query) -------------
+		RDEBUG( "retValue", retValue );
-if ( retValue == KErrNone )
-{
-// Enable lock setting in domestic OS. It is safe to enable the
-// lock setting since RemoteLock API requires remote locking to
-// be enabled when changing or setting the remote lock message.
-retValue = RemoteLockSetLockSettingL( ETrue );
-}
-RDEBUG( "retValue", retValue );
-#ifdef _DEBUG
-RDebug::Print(_L("(SecUi)CSecuritySettings::ChangeRemoteLockCodeL() - Exit" ) );
-#endif // _DEBUG
 return retValue;
-#else //! RD_REMOTELOCK
-return KErrNotSupported;
-#endif //RD_REMOTELOCK
 }
 //
 // ----------------------------------------------------------
 // CSecuritySettings::RemoteLockSetLockSettingL()
 // Changes lock setting in domestic OS. Changing the domestic OS lock setting
 TInt CSecuritySettings::RemoteLockSetLockSettingL(TBool aLockSetting)
 {
 TInt retValue( KErrNone );
 		RDEBUG( "aLockSetting", aLockSetting );
 RMobilePhone::TMobilePhoneLockSetting lockSetting = RMobilePhone::ELockSetEnabled;
 RMobilePhone::TMobilePhoneLock lockType = RMobilePhone::ELockPhoneDevice;
+RMobilePhone::TMobilePhoneLockInfoV1 lockInfo;
+RMobilePhone::TMobilePhoneLockInfoV1Pckg lockInfoPkg(lockInfo);
+//get lock info
+iWait->SetRequestType(EMobilePhoneGetLockInfo);
+RDEBUG("GetLockInfo", 0);
+iPhone.GetLockInfo(iWait->iStatus, lockType, lockInfoPkg);
+RDEBUG("WaitForRequestL", 0);
+TInt status = iWait->WaitForRequestL();
+RDEBUG("WaitForRequestL status", status);
+#ifdef __WINS__
+if (status == KErrNotSupported || status == KErrTimedOut)
+{
+lockInfo.iSetting = RMobilePhone::ELockSetDisabled;
+status = KErrNone;
+}
+#endif
+User::LeaveIfError(status);
+		RDEBUG("current lockInfo.iSetting", lockInfo.iSetting);
+		// disabled->disabled	should not happen
+		// enabled->enabled		happens because a change of message also forces a code re-validation
 if ( aLockSetting )
 {
 lockSetting = RMobilePhone::ELockSetEnabled;
 }
 else
 {
 lockSetting = RMobilePhone::ELockSetDisabled;
 }
-		RDEBUG("lockSetting", lockSetting);
+		RDEBUG("future lockSetting", lockSetting);
 iWait->SetRequestType( EMobilePhoneSetLockSetting );
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsQueryRequestCancel, ESecurityUIsQueryRequestOk);
 RDEBUG( "SetLockSetting", 0 );
 iPhone.SetLockSetting( iWait->iStatus, lockType, lockSetting );	// this will PassPhraseRequiredL
 {
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 *****************************************************/
-#if defined(_DEBUG)
+		RDEBUG("0", 0);
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeSimSecurityL()"));
-#endif
 RMobilePhone::TMobilePhoneLockInfoV1 lockInfo;
 RMobilePhone::TMobilePhoneLockInfoV1Pckg lockInfoPkg(lockInfo);
 RMobilePhone::TMobilePhoneLock lockType = RMobilePhone::ELockPhoneToICC;
 RMobilePhone::TMobilePhoneLockSetting lockChangeSetting;
 status = KErrNone;
 }
 #endif
 User::LeaveIfError(status);
 TInt currentItem = 0;
+		RDEBUG("lockInfo.iSetting", lockInfo.iSetting);
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeSimSecurityL()lockInfo: ELockSetDisabled"));
-#endif
 currentItem = 1; // off
 }
 if (currentItem == 0) // switch the flag
 {
 if (status == KErrNotSupported || status == KErrTimedOut)
 status = KErrNone;
 #endif
 // the error was displayed in the handler
-#if defined(_DEBUG)
+		RDEBUG("status", status);
-RDebug::Print( _L("(SECUI)CSecuritySettings::ChangeSimSecurityL(): RETURN CODE: %d"), status);
-#endif
 switch (status)
 {
 case KErrNone:
 {
 break;
 EXPORT_C TBool CSecuritySettings::ChangeUPinRequestL()
 {
 TBool wcdmaSupported(
 FeatureManager::FeatureSupported( KFeatureIdProtocolWcdma));
 TBool upinSupported(FeatureManager::FeatureSupported( KFeatureIdUpin));
+		RDEBUG("wcdmaSupported", wcdmaSupported);
+		RDEBUG("upinSupported", upinSupported);
 if (wcdmaSupported || upinSupported)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeUPinRequestL()"));
-#endif
 TInt simState;
 TInt err(KErrGeneral);
 err = RProperty::Get(KPSUidStartup, KPSSimStatus, simState);
 User::LeaveIfError(err);
 TBool simRemoved(simState == ESimNotPresent);
 status = KErrNone;
 #endif
 User::LeaveIfError(status);
 TInt currentItem = 0;
-#if defined(_DEBUG)
+				RDEBUG("lockInfo.iSetting", lockInfo.iSetting);
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeUPinRequestL() GetLockInfo"));
-#endif
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeUPinRequestL() lockInfo: ELockSetDisabled"));
-#endif
 currentItem = 1; // off
 }
 if (currentItem == 0) // switch the flag
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeUPinRequestL() currentItem: ELockSetDisabled"));
-#endif
 lockChangeSetting = RMobilePhone::ELockSetDisabled;
 }
 else
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeUPinRequestL() currentItem: ELockSetEnabled"));
-#endif
 lockChangeSetting = RMobilePhone::ELockSetEnabled;
 }
+				RDEBUG("lockChangeSetting", lockChangeSetting);
 // Raise a flag to indicate that the UPIN
 // request coming from ETEL has originated from SecUi and not from Engine.
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery,
 ESecurityUIsSecUIOriginated);
 // Change the lock setting
 RDEBUG("WaitForRequestL", 0);
 status = iWait->WaitForRequestL();
 RDEBUG("WaitForRequestL status", status);
 // Lower the flag
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery,
-ESecurityUIsETelAPIOriginated);
+ESecurityUIsSecUIOriginatedUninitialized);
 #ifdef __WINS__
 if (status == KErrNotSupported || status == KErrTimedOut)
 status = KErrNone;
 #endif
 EXPORT_C TBool CSecuritySettings::SwitchPinCodesL()
 {
 TBool wcdmaSupported(
 FeatureManager::FeatureSupported( KFeatureIdProtocolWcdma));
 TBool upinSupported(FeatureManager::FeatureSupported( KFeatureIdUpin));
+				RDEBUG("wcdmaSupported", wcdmaSupported);
+				RDEBUG("upinSupported", upinSupported);
 if (wcdmaSupported || upinSupported)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL()"));
-#endif
 // If we are in simless offline mode the PIN codes can't obviously be switched
 TInt simState;
 TInt err(KErrGeneral);
 err = RProperty::Get(KPSUidStartup, KPSSimStatus, simState);
 User::LeaveIfError(err);
 iCustomPhone.GetActivePin(activeCode);
 RMobilePhone::TMobilePhoneLockInfoV1 lockInfo;
 RMobilePhone::TMobilePhoneLockInfoV1Pckg lockInfoPkg(lockInfo);
-#if defined(_DEBUG)
+				RDEBUG("EMobilePhoneGetLockInfo", EMobilePhoneGetLockInfo);
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL() GetLockInfo"));
-#endif
 iWait->SetRequestType(EMobilePhoneGetLockInfo);
 if (activeCode == RMobilePhone::ESecurityUniversalPin)
 {
 lockType = RMobilePhone::ELockUniversalPin;
 #endif
 User::LeaveIfError(res);
 }
 // code request must be ON to change active code.
+				RDEBUG("lockInfo.iSetting", lockInfo.iSetting);
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL() CODE REQ NOT ON."));
-#endif
 if (activeCode != RMobilePhone::ESecurityUniversalPin)
 {
 ShowResultNoteL(R_UPIN_NOT_ALLOWED,
 CAknNoteDialog::EErrorTone);
 }
 else
 {
 ShowResultNoteL(R_PIN_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
 }
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL() CODE REQ NOT ON NOTE END."));
-#endif
 return EFalse;
 }
 iCustomPhone.GetActivePin(activeCode);
 TInt currentItem = 0;
-#if defined(_DEBUG)
+				RDEBUG("activeCode", activeCode);
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL() GetLockInfo"));
-#endif
 if (activeCode == RMobilePhone::ESecurityUniversalPin)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL() active code: UPIN"));
-#endif
 currentItem = 1; // UPIN
 }
 if (currentItem == 0) // switch the flag
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL() currentItem: UPIN"));
-#endif
 lockType = RMobilePhone::ELockUniversalPin;
 }
 else
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::SwitchPinCodesL() currentItem: PIN1"));
-#endif
 lockType = RMobilePhone::ELockICC;
 }
+				RDEBUG("lockType", lockType);
 // Raise a flag to indicate that the code
 // request coming from ETEL has originated from SecUi and not from Engine.
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery,
 ESecurityUIsSecUIOriginated);
 RDEBUG("WaitForRequestL", 0);
 TInt status = iWait->WaitForRequestL();
 RDEBUG("WaitForRequestL status", status);
 // Lower the flag
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery,
-ESecurityUIsETelAPIOriginated);
+ESecurityUIsSecUIOriginatedUninitialized);
 #ifdef __WINS__
 if (status == KErrNotSupported || status == KErrTimedOut)
 status = KErrNone;
 #endif
 {
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 *****************************************************/
-#if defined(_DEBUG)
+		RDEBUG("0", 0);
-RDebug::Print(_L("(SECUI)CSecuritySettings::SetFdnModeL()"));
-#endif
 RMmCustomAPI::TSecurityCodeType secCodeType =
 RMmCustomAPI::ESecurityCodePin2;
 TBool isBlocked = EFalse;
 TInt ret = iCustomPhone.IsBlocked(secCodeType, isBlocked);
 #ifdef __WINS__
 if (status == KErrNotSupported)
 status = KErrNone;
 #endif
-#if defined(_DEBUG)
+		RDEBUG("status", status);
-RDebug::Print( _L("(SECUI)CSecuritySettings::SetFdnModeL(): RETURN CODE: %d"), status);
-#endif
 switch (status)
 {
 case KErrNone:
 break;
 case KErrGsm0707IncorrectPassword:
 {
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 *****************************************************/
-#if defined(_DEBUG)
+		RDEBUG("0", 0);
-RDebug::Print(_L("(SECUI)CSecuritySettings::GetFdnMode()"));
-#endif
 return iPhone.GetFdnStatus(aFdnMode);
 }
 //
 // ----------------------------------------------------------
 void CSecuritySettings::ShowResultNoteL(TInt aResourceID,
 CAknNoteDialog::TTone aTone)
 {
 RDEBUG("aResourceID", aResourceID);
-/*
-CAknNoteDialog* noteDlg = new (ELeave) CAknNoteDialog(REINTERPRET_CAST(CEikDialog**,&noteDlg));
-noteDlg->SetTimeout(CAknNoteDialog::ELongTimeout);
-noteDlg->SetTone(aTone);
-noteDlg->ExecuteLD(aResourceID);
-*/
 CHbDeviceMessageBoxSymbian* messageBox =
 CHbDeviceMessageBoxSymbian::NewL(
 CHbDeviceMessageBoxSymbian::EWarning);
 CleanupStack::PushL(messageBox);
 _LIT(KText, "ShowResultNoteL: ");
 break;
 case R_SIM_NOT_ALLOWED:
 titleTr.Append(_L("R_SIM_NOT_ALLOWED"));
 title.Append(_L("SIM NOT ALLOWED"));
 break;
+case R_REMOTELOCK_INVALID_CODE:
+titleTr.Append(_L("R_REMOTELOCK_INVALID_CODE"));
+title.Append(_L("REMOTELOCK INVALID CODE"));
+break;
 default: // " "
 titleTr.Append(_L("Specific Error"));
 title.Append(_L("Specific Error"));
 break;
 {
 TBool wcdmaSupported(
 FeatureManager::FeatureSupported( KFeatureIdProtocolWcdma));
 TBool upinSupported(FeatureManager::FeatureSupported( KFeatureIdUpin));
 TBool isSupported = EFalse;
+		RDEBUG("wcdmaSupported", wcdmaSupported);
+		RDEBUG("upinSupported", upinSupported);
 if (wcdmaSupported || upinSupported)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::IsUpinSupported() BEGIN"));
-#endif
 RMobilePhone::TMobilePhoneLockInfoV1 lockInfo;
 //get lock info
 RMobilePhone::TMobilePhoneLockInfoV1Pckg lockInfoPkg(lockInfo);
 iWait->SetRequestType(EMobilePhoneGetLockInfo);
 RDEBUG("WaitForRequestL", 0);
 TInt res = iWait->WaitForRequestL();
 RDEBUG("WaitForRequestL res", res);
 if ((res == KErrNotSupported) || (res == KErrGsmInvalidParameter))
 {
-#if defined(_DEBUG)
+RDEBUG("0", 0);
-RDebug::Print(_L("(SECUI)CSecuritySettings::IsUpinSupported(): NOT SUPPORTED"));
-#endif
 isSupported = EFalse;
 }
 else
 {
-RDEBUG("0", 0);
+RDEBUG("1", 1);
 isSupported = ETrue;
 }
 }
 else
 isSupported = EFalse;
 TInt err(KErrGeneral);
 err = RProperty::Get(KPSUidStartup, KPSSimStatus, simState);
 User::LeaveIfError(err);
 TBool simRemoved(simState == ESimNotPresent);
+		RDEBUG("simRemoved", simRemoved);
 if (simRemoved)
 {
 ShowResultNoteL(R_INSERT_SIM, CAknNoteDialog::EErrorTone);
 return KErrAccessDenied;
 }
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangePinParamsL()"));
-#endif
 RMobilePhone::TMobilePhoneSecurityCode secCodeType;
 secCodeType = RMobilePhone::ESecurityCodePin1;
 RMobilePhone::TMobilePassword oldPassword;
 RMobilePhone::TMobilePassword newPassword;
 RDEBUG("aShowError", aShowError);
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 *****************************************************/
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeSecCodeParamsL()"));
-#endif
 TInt res = KErrNone;
 TInt queryAccepted = KErrCancel;
 RMobilePhone::TMobilePassword newPassword;
 RMobilePhone::TMobilePhoneSecurityCode secCodeType;
 TSCPSecCode oldPassword;
 newCode.Copy(newPassword);
 if (scpClient.Connect() == KErrNone)
 {
 RDEBUG("scpClient.StoreCode", 0);
-/*
+// this is the old method. Obsolete now
 // scpClient.StoreCode( newCode );
 RArray<TDevicelockPolicies> aFailedPolicies;
 TDevicelockPolicies failedPolicy;
 TInt retLockcode = KErrNone;
 retLockcode = scpClient.StoreLockcode( newCode, oldPassword, aFailedPolicies );
 RDEBUG( "retLockcode", retLockcode );
 RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() );
 for(TInt i=0; i<aFailedPolicies.Count(); i++)
-{
+	                     {
-failedPolicy = aFailedPolicies[i];
+	                     failedPolicy = aFailedPolicies[i];
-RDEBUG( "failedPolicy", failedPolicy );
+	                     RDEBUG( "failedPolicy", failedPolicy );
-}
+	                     }
-*/
 scpClient.Close();
 }
 }
 break;
 }
 status = KErrNone;
 }
 #endif
 User::LeaveIfError(status);
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangePinRequestParamsL() GetLockInfo"));
-#endif
 if (aOldPassword.Length() == 0) // only if input parameters are empty
 {
 // switch the value.
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 lEnable = 1; // on
 else
 lEnable = 0; // off
 }
+		RDEBUG("lEnable", lEnable);
 if (lEnable == 0)
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangePinRequestParamsL() currentItem: ELockSetDisabled"));
-#endif
 lockChangeSetting = RMobilePhone::ELockSetDisabled;
 }
 else
 {
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangePinRequestParamsL() currentItem: ELockSetEnabled"));
-#endif
 lockChangeSetting = RMobilePhone::ELockSetEnabled;
 }
+		RDEBUG("lockChangeSetting", lockChangeSetting);
 // Raise a flag to indicate that the PIN
 // request coming from ETEL has originated from SecUi and not from Engine.
 TInt tRet = RProperty::Set(KPSUidSecurityUIs,
 KSecurityUIsSecUIOriginatedQuery, ESecurityUIsSecUIOriginated);
-if (tRet != KErrNone)
+		RDEBUG("tRet", tRet);
-{
-#if defined(_DEBUG)
-RDebug::Print(_L("(SECUI)CSecuritySettings::ChangePinRequestParamsL():\
-FAILED to set the SECUI query Flag: %d"), tRet);
-#endif
-}
 // Change the lock setting
 iWait->SetRequestType(EMobilePhoneSetLockSetting);
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsQueryRequestCancel,
 ESecurityUIsQueryRequestOk);
 status = KErrNone;
 #endif
 // Lower the flag
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery,
-ESecurityUIsETelAPIOriginated);
+ESecurityUIsSecUIOriginatedUninitialized);
 switch (status)
 {
 case KErrNone:
 {

changeset 26	aad866c37519
parent 22	6b63ca65093a
child 30	cc1cea6aabaf
child 37	7bad16cccaca