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

equal deleted inserted replaced

-:989397f9511c
+:67b3e3c1fc87
 */
 #include <etelmm.h>
 #include <exterror.h>
 #include <textresolver.h>
-#include <aknnotedialog.h>
 #include <mmtsy_names.h>
 #include <centralrepository.h>
 #include <gsmerror.h>
 #include <SCPClient.h>
 #include <StringLoader.h>
 #include "secui.hrh"
 #include "secuisecurityhandler.h"
 #include "secuicodequerydialog.h"
 #include "SecUiWait.h"
 #include <hb/hbcore/hbtextresolversymbian.h>
-#include <aknnotewrappers.h>
 #include <StringLoader.h>
 #include <RemoteLockSettings.h>
 #include <featmgr.h>
 #include <hb/hbwidgets/restricted/hbdevicedialogsextensionsymbian_r.h>
 #include "SecQueryUi.h"
 User::LeaveIfError(iServer.GetPhoneInfo(PhoneIndex, PhoneInfo));
 User::LeaveIfError(iPhone.Open(iServer, PhoneInfo.iName));
 User::LeaveIfError(iCustomPhone.Open(iPhone));
 iSecurityHandler = new (ELeave) CSecurityHandler(iPhone);
 _LIT(KFileName, "secui_");
 _LIT(KPath, "z:/resource/qt/translations/");
 RDEBUG("HbTextResolverSymbian", 0);
 TBool result = HbTextResolverSymbian::Init(KFileName, KPath);
 RDEBUG("result", result);
 }
 //
 // ----------------------------------------------------------
 // CSecuritySettings::~CSecuritySettings()
 // Destructor
 CSecQueryUi * iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 // this queries both, and verifies itself
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_new_rem_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_device_dialog_new_locking_message"),0);	// old txt_pin_code_dialog_new_rem_code
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("|"));
-HBufC* stringHolder2 = HbTextResolverSymbian::LoadLC(_L("Verify"));
+HBufC* stringHolder2 = TranslateLC(_L("txt_device_dialog_retype_locking_message"),0);
 title.Append(stringHolder2->Des());
 CleanupStack::PopAndDestroy(stringHolder2);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, aRemoteLockCode, SEC_REMOTELOCK_CODE_MIN_LENGTH, SEC_REMOTELOCK_CODE_MAX_LENGTH, ESecUiAlphaSupported
 | ESecUiCancelSupported | ESecUiEmergencyNotSupported | ESecUiNone);
 RDEBUG("aRemoteLockCode", 0);
 RSCPClient scpClient;
 TInt ret = scpClient.Connect();
 RDEBUG("ret", ret);
 retLockcode = scpClient.VerifyCurrentLockcode(aRemoteLockCode, aISACode, aFailedPolicies, scpFlags);
 RDEBUG("retLockcode", retLockcode);
+retLockcode=retLockcode;
 	  scpClient.Close();
 RDEBUG("aISACode", 0);
 RDEBUGSTR(aISACode);
 {
 // 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( "return KErrCancel because msg matches code", KErrCancel );
-ShowResultNoteL(R_REMOTELOCK_INVALID_CODE, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_REMOTELOCK_INVALID_CODE, EErrorTone);
 return KErrCancel;
 }
 RDEBUG( "retValue", retValue );
 return retValue;
 break;
 default:
 break;
 }
+		// This doesn't loop
 RDEBUG( "retValue", retValue );
 return retValue;
 }
 //
 RProperty::Set(KPSUidSecurityUIs, KSecurityUIsQueryRequestCancel, ESecurityUIsQueryRequestOk);
 				CWait* newWait = NULL;
 newWait = CWait::NewL();
 RDEBUG("newWait SetLockSetting", 0);
 iPhone.SetLockSetting(newWait->iStatus, lockType, lockChangeSetting); // this invokes the handler
-RDEBUG("newWait WaitForRequestL",
+RDEBUG("newWait WaitForRequestL", 0);
-0);
 status = newWait->WaitForRequestL();
-RDEBUG("newWait WaitForRequestL status",
+RDEBUG("newWait WaitForRequestL status", status);
-status);
 delete newWait;
-/*
-iWait->SetRequestType(EMobilePhoneSetLockSetting);
-RProperty::Set(KPSUidSecurityUIs, KSecurityUIsQueryRequestCancel, ESecurityUIsQueryRequestOk);
-RDEBUG("SetLockSetting", 0);
-iPhone.SetLockSetting(iWait->iStatus, lockType, lockChangeSetting); // this invokes the handler
-RDEBUG("WaitForRequestL", 0);
-status = iWait->WaitForRequestL();
-RDEBUG("WaitForRequestL status", status);
-*/
 #ifdef __WINS__
 if (status == KErrNotSupported || status == KErrTimedOut)
 status = KErrNone;
 #endif
 User::LeaveIfError(err);
 TBool simRemoved(simState == ESimNotPresent);
 if (simRemoved)
 {
-ShowResultNoteL(R_INSERT_SIM, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_INSERT_SIM, EErrorTone);
 return EFalse;
 }
 RMobilePhone::TMobilePhoneLockInfoV1 lockInfo;
 RMobilePhone::TMobilePhoneLockInfoV1Pckg lockInfoPkg(lockInfo);
 break;
 }
 case KErrGsm0707OperationNotAllowed:
 {
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 return EFalse;
 }
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
 User::LeaveIfError(err);
 TBool simRemoved(simState == ESimNotPresent);
 if (simRemoved)
 {
-ShowResultNoteL(R_INSERT_SIM, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_INSERT_SIM, EErrorTone);
 return EFalse;
 }
 RMobilePhone::TMobilePhoneLock lockType = RMobilePhone::ELockUniversalPin;
 RMobilePhone::TMobilePhoneLockSetting lockChangeSetting = RMobilePhone::ELockReplaced;
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 {
 if (activeCode != RMobilePhone::ESecurityUniversalPin)
 {
-ShowResultNoteL(R_UPIN_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_UPIN_NOT_ALLOWED, EErrorTone);
 }
 else
 {
-ShowResultNoteL(R_PIN_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_PIN_NOT_ALLOWED, EErrorTone);
 }
 return EFalse;
 }
 iCustomPhone.GetActivePin(activeCode);
 break;
 }
 case KErrGsm0707OperationNotAllowed:
 {
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 return EFalse;
 }
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
 case KErrGsm0707SIMPuk2Required:
 break;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 // Pin2 features blocked permanently!
-ShowResultNoteL(R_PIN2_REJECTED, CAknNoteDialog::EConfirmationTone);
+ShowResultNoteL(R_PIN2_REJECTED, EConfirmationTone);
 break;
 case KErrGsm0707SimNotInserted:
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 break;
 default:
 ShowErrorNoteL(retPhone);
 break;
 }
 queryAccepted = KErrCancel;
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_pin2_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_pin_code_dialog_pin2_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("$"));
 title.AppendNum(codeInfo.iRemainingEntryAttempts);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, password, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported
 case KErrNone:
 break;
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 // code was entered erroneously
-ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_CODE_ERROR, EErrorTone);
 return AskPin2L();
 case KErrGsm0707OperationNotAllowed:
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 return EFalse;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 // code was blocked
-ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_CODE_ERROR, EErrorTone);
 return EFalse;
 default:
 ShowErrorNoteL(retPhone);
 return AskPin2L();
 }
 case KErrGsm0707SIMPuk2Required:
 break;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 // Pin2 features blocked permanently!
-ShowResultNoteL(R_PIN2_REJECTED, CAknNoteDialog::EConfirmationTone);
+ShowResultNoteL(R_PIN2_REJECTED, EConfirmationTone);
 break;
 case KErrGsm0707SimNotInserted:
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 break;
 default:
 ShowErrorNoteL(ret);
 break;
 }
 break;
 case KErrAbort:
 break;
 case KErrGsm0707OperationNotAllowed:
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 break;
 default:
 ShowErrorNoteL(status);
 break;
 }
 // qtdone
 void CSecuritySettings::ShowErrorNoteL(TInt aError)
 {
 RDEBUG("aError", aError);
-ShowResultNoteL(aError, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(aError, EErrorTone);
 }
 //
 // ----------------------------------------------------------
 // CSecuritySettings::ShowResultNoteL()
 // Shows result note
 // ----------------------------------------------------------
 // qtdone
-void CSecuritySettings::ShowResultNoteL(TInt aResourceID, CAknNoteDialog::TTone aTone)
+void CSecuritySettings::ShowResultNoteL(TInt aResourceID, TInt aTone)
 {
 RDEBUG("aResourceID", aResourceID);
 CHbDeviceMessageBoxSymbian* messageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
 const TInt KCriticalLevel = 2;
 case KErrNotSupported:
 titleTr.Append(_L("txt_pin_code_dpopinfo_operation_not_supported"));
 title.Append(_L("Not Supported"));
 break;
 case R_SEC_BLOCKED:
-titleTr.Append(_L("txt_pin_code_dpopinfo_security_blocked"));
+titleTr.Append(_L("txt_devicelocking_dpophead_lock_code_is_blocked"));	// txt_pin_code_dpopinfo_security_blocked
 title.Append(_L("BLOCKED"));
 break;
 case R_CODE_ERROR:
 titleTr.Append(_L("R_CODE_ERROR"));
 title.Append(_L("ERROR"));
 titleTr.Append(_L("R_CONFIRMATION_NOTE"));
 title.Append(_L("CONFIRMED"));
 satisfactoryIcon = 1;
 break;
 case R_CODES_DONT_MATCH:
-titleTr.Append(_L("R_CODES_DONT_MATCH"));
+titleTr.Append(_L("txt_devicelocking_dpophead_codes_do_not_match"));
 title.Append(_L("CODES DONT MATCH"));
 break;
 case R_PIN_CODE_CHANGED_NOTE:
 titleTr.Append(_L("txt_pin_code_dpopinfo_code_chaged")); // note the spelling mistake "chaged"
 title.Append(_L("PIN CODE CHANGED"));
 // txt_pin_code_dpopinfo_if_failed_be_ready_with_puk
 }
 HBufC* stringHolder;
 RDEBUG("titleTr", 1);
-stringHolder = HbTextResolverSymbian::LoadLC(titleTr); // titleTr  should I    TRAP( err,    ?
+stringHolder = TranslateLC(titleTr,0); // titleTr  should I    TRAP( err,    ?
-RDEBUG("got stringHolder", 1);
+if(!stringHolder)
+	{
+	RDEBUG("not got stringHolder", 0);
+	}
+	else
+		{
+	RDEBUG("got stringHolder", 1);
+		}
 messageBox->SetTextL(stringHolder->Des()); // title
 RDEBUG("aResourceID", aResourceID);
+RDEBUG("titleTr", 0);
 RDEBUGSTR(titleTr);
+RDEBUG("stringHolder->Des()", 0);
+RDEBUGSTR(stringHolder->Des());
 _LIT(KIconNameWondering, "qtg_small_smiley_wondering");
 _LIT(KIconNameSmile, "qtg_small_smiley_smile");
 if (satisfactoryIcon==1)
 messageBox->SetIconNameL(KIconNameSmile);
 else
 messageBox->SetIconNameL(KIconNameWondering);
-if (aTone == CAknNoteDialog::EErrorTone) // another case is EConfirmationTone
+if (aTone == EErrorTone) // another case is EConfirmationTone
 {
 messageBox->SetTimeout(messageBox->Timeout() * 2); // errors are displayed double time
 }
 // messageBox->ShowL();
 RDEBUG("calling ExecL", 0);
 CHbDeviceMessageBoxSymbian::TButtonId selection = messageBox->ExecL();	// this guarantees that it waits for the dismiss/timeout
 RDEBUG("called ExecL.selection", selection);
 CleanupStack::PopAndDestroy(stringHolder);
 CleanupStack::PopAndDestroy(); // messageBox
+		RDEBUG("0x99", 0x99);
 }
 //
 // ----------------------------------------------------------
 // CSecuritySettings::IsUpinSupportedL()
 RDEBUG("aNewPassword", 0);
 RDEBUGSTR(aNewPassword);
 RDEBUG("aCaption", 0);
 RDEBUGSTR(aCaption);
 RDEBUG("aShowError", aShowError);
+(void)aFlags;
+(void)aCaption;
+(void)aShowError;
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 *****************************************************/
 TBool simRemoved(simState == ESimNotPresent);
 RDEBUG("simRemoved", simRemoved);
 if (simRemoved)
 {
-ShowResultNoteL(R_INSERT_SIM, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_INSERT_SIM, EErrorTone);
 return KErrAccessDenied;
 }
 RMobilePhone::TMobilePhoneSecurityCode secCodeType;
 secCodeType = RMobilePhone::ESecurityCodePin1;
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 {
 RDEBUG("RMobilePhone::ELockSetDisabled",
 RMobilePhone::ELockSetDisabled);
-ShowResultNoteL(R_PIN_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_PIN_NOT_ALLOWED, EErrorTone);
 return KErrAccessDenied;
 }
 RDEBUG("0", 0);
 iWait->SetRequestType(EMobilePhoneGetSecurityCodeInfo);
 queryAccepted = KErrCancel;
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_pin_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_pin_code_dialog_pin_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("$"));
 title.AppendNum(codeInfo.iRemainingEntryAttempts);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, oldPassword, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported
 if (res == KErrNotSupported)
 res = KErrNone;
 #endif
 if (res != KErrNone)
 {
-ShowResultNoteL(res, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(res, EErrorTone);
 		        newPassword = _L("");
 		        oldPassword = _L("");
 goto askChangePinParamsL;
 }
 while (newPassword.Length() == 0)
 {
 // this is not needed because the dialog won't allow to close, unless codes match
 // codes do not match -> note -> ask new pin and verification codes again
 // if(newPassword.Length()>0)
-//  ShowResultNoteL(R_CODES_DONT_MATCH, CAknNoteDialog::EErrorTone);
+//  ShowResultNoteL(R_CODES_DONT_MATCH, EErrorTone);
 newPassword = _L("");
 // new pin code query
 if (aOldPassword.Length() == 0) // only if input parameters are empty
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 // this queries both, and verifies itself
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_new_pin_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_pin_code_dialog_new_pin_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("|"));
-HBufC* stringHolder2 = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_verify_new_pin_code"));
+HBufC* stringHolder2 = TranslateLC(_L("txt_pin_code_dialog_verify_new_pin_code"),0);
 title.Append(stringHolder2->Des());
 CleanupStack::PopAndDestroy(stringHolder2);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, newPassword, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported
 | ESecUiEmergencyNotSupported | secCodeType);
 RDEBUG("newPassword", 1);
 switch (res)
 {
 case KErrNone:
 {
 // code changed
-ShowResultNoteL(R_PIN_CODE_CHANGED_NOTE, CAknNoteDialog::EConfirmationTone);
+ShowResultNoteL(R_PIN_CODE_CHANGED_NOTE, EConfirmationTone);
 break;
 }
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
 // code was entered erroneously. This is strange, because it was verified before
-ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_CODE_ERROR, EErrorTone);
 goto askChangePinParamsL;
 }
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 {
 return KErrLocked;
 }
 case KErrGsm0707OperationNotAllowed:
 {
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 return KErrGsm0707OperationNotAllowed;
 }
 case KErrAbort:
 {
 break;
 User::LeaveIfError(err);
 TBool simRemoved(simState == ESimNotPresent);
 if (simRemoved)
 {
-ShowResultNoteL(R_INSERT_SIM, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_INSERT_SIM, EErrorTone);
 return KErrAccessDenied;
 }
 RMobilePhone::TMobilePhoneSecurityCode secCodeType;
 secCodeType = RMobilePhone::ESecurityUniversalPin;
 RDEBUG("lockInfo.iSetting", lockInfo.iSetting);
 RDEBUG("RMobilePhone::ELockSetDisabled", RMobilePhone::ELockSetDisabled);
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 {
-ShowResultNoteL(R_UPIN_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_UPIN_NOT_ALLOWED, EErrorTone);
 return KErrAccessDenied;
 }
 iWait->SetRequestType(EMobilePhoneGetSecurityCodeInfo);
 RDEBUG("GetSecurityCodeInfo", 0);
 queryAccepted = KErrCancel;
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_upin_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_pin_code_dialog_upin_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("$"));
 title.AppendNum(codeInfo.iRemainingEntryAttempts);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, oldPassword, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported
 iSecQueryUi = CSecQueryUi::NewL();
 // this queries both, and verifies itself
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_new_upin_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_pin_code_dialog_new_upin_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("|"));
-HBufC* stringHolder2 = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_retype_upin_code"));
+HBufC* stringHolder2 = TranslateLC(_L("txt_pin_code_dialog_retype_upin_code"),0);
 title.Append(stringHolder2->Des());
 CleanupStack::PopAndDestroy(stringHolder2);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, newPassword, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported
 | ESecUiEmergencyNotSupported | secCodeType);
 RDEBUG("newPassword", 0);
 switch (res)
 {
 case KErrNone:
 {
 // code changed
-ShowResultNoteL(R_UPIN_CODE_CHANGED_NOTE, CAknNoteDialog::EConfirmationTone);
+ShowResultNoteL(R_UPIN_CODE_CHANGED_NOTE, EConfirmationTone);
 break;
 }
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
 // code was entered erroneously
-ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_CODE_ERROR, EErrorTone);
 ChangeUPinParamsL(_L(""), _L(""), aFlags, aCaption, aShowError);
 break;
 }
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 return KErrLocked;
 }
 case KErrGsm0707OperationNotAllowed:
 {
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 return KErrGsm0707OperationNotAllowed;
 }
 case KErrAbort:
 {
 break;
 User::LeaveIfError(err);
 TBool simRemoved(simState == ESimNotPresent);
 if (simRemoved)
 {
-ShowResultNoteL(R_INSERT_SIM, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_INSERT_SIM, EErrorTone);
 return KErrAccessDenied;
 }
 RMmCustomAPI::TSecurityCodeType secCodeType;
 RMobilePhone::TMobilePhoneSecurityCode EtelsecCodeType;
 case KErrGsm0707SIMPuk2Required:
 break;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 // Pin2 features blocked permanently!
-ShowResultNoteL(R_PIN2_REJECTED, CAknNoteDialog::EConfirmationTone);
+ShowResultNoteL(R_PIN2_REJECTED, EConfirmationTone);
 break;
 case KErrGsm0707SimNotInserted:
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 break;
 default:
 ShowErrorNoteL(ret);
 break;
 }
 queryAccepted = KErrCancel;
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_pin2_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_pin_code_dialog_pin2_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("$"));
 title.AppendNum(codeInfo.iRemainingEntryAttempts);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, oldPassword, SEC_C_PIN2_CODE_MIN_LENGTH, SEC_C_PIN2_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported
 CSecQueryUi * iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 // this queries both, and verifies itself
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_new_pin2_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_pin_code_dialog_new_pin2_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("|"));
-HBufC* stringHolder2 = HbTextResolverSymbian::LoadLC(_L("Verify"));
+HBufC* stringHolder2 = TranslateLC(_L("Verify"),0);
 title.Append(stringHolder2->Des());
 CleanupStack::PopAndDestroy(stringHolder2);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, newPassword, SEC_C_PIN2_CODE_MIN_LENGTH, SEC_C_PIN2_CODE_MAX_LENGTH, ESecUiAlphaNotSupported | ESecUiCancelSupported
 | ESecUiEmergencyNotSupported | secCodeType);
 RDEBUG("newPassword", 0);
 switch (res)
 {
 case KErrNone:
 {
 // code changed
-ShowResultNoteL(R_PIN2_CODE_CHANGED_NOTE, CAknNoteDialog::EConfirmationTone);
+ShowResultNoteL(R_PIN2_CODE_CHANGED_NOTE, EConfirmationTone);
 break;
 }
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
-ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_CODE_ERROR, EErrorTone);
 ChangePin2ParamsL(_L(""), _L(""), aFlags, aCaption, aShowError);
 break;
 }
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 {
 // Pin2 blocked!
-ShowResultNoteL(KErrLocked, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(KErrLocked, EErrorTone);
 CSecurityHandler* handler = new (ELeave) CSecurityHandler(iPhone);
 CleanupStack::PushL(handler);
 handler->HandleEventL(RMobilePhone::EPuk2Required);
 CleanupStack::PopAndDestroy(handler); // handler
 return KErrLocked;
 }
 case KErrGsm0707OperationNotAllowed:
 {
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 return KErrGsm0707OperationNotAllowed;
 }
 case KErrAbort:
 {
 break;
 TInt aShowError)
 {
 askChangeSecCodeParamsL:
 RDEBUG("aFlags", aFlags);
 RDEBUG("aShowError", aShowError);
+(void)aCaption;
+(void)aFlags;
+(void)aShowError;
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 *****************************************************/
 TInt res = KErrNone;
 		       res = KErrTDevicelockPolicies + failedPolicy;
 		       }
 	     	 scpClient.Close();
 	     	 if(res!=KErrNone)
 	     	 		{
-	     	 		ShowResultNoteL(res, CAknNoteDialog::EErrorTone);
+	     	 		ShowResultNoteL(res, EErrorTone);
 	 	 		return res;
 	 	 		}
 				}
 			else
 				{
 queryAccepted = KErrCancel;
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_sec_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_devicelocking_dialog_lock_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, oldPassword, SEC_C_SECURITY_CODE_MIN_LENGTH, SEC_C_SECURITY_CODE_MAX_LENGTH, ESecUiAlphaSupported
 | ESecUiCancelSupported | ESecUiEmergencyNotSupported | secCodeType);
 RDEBUG("oldPassword", 0);
 TInt scpCurrFlags = 0;
 RDEBUG("scpClient.VerifyCurrentLockcode", 0);
 // this validate on ISA . No need to do iPhone.VerifySecurityCode
 retCurrLockcode = scpCurrClient.VerifyCurrentLockcode(oldPassword, aCurrISACode, aCurrFailedPolicies, scpCurrFlags);
 RDEBUG("retCurrLockcode", retCurrLockcode);
+		retCurrLockcode=retCurrLockcode;
 RDEBUG("aCurrISACode", 0);
 RDEBUGSTR(aCurrISACode);
 scpCurrClient.Close();
 RDEBUG("PopAndDestroy", 0);
 CleanupStack::PopAndDestroy(); //scpCurrClient
 res = KErrNone;
 #endif
 if (res != KErrNone)
 {
-ShowResultNoteL(res, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(res, EErrorTone);
 return res;
 }
 while (newPassword.Length() == 0)
 {
 // codes do not match -> note -> ask new pin and verification codes again
 // note that this never happens because the dialog doesn't dismiss until both codes match
 if (newPassword.Length() > 0)
-ShowResultNoteL(R_CODES_DONT_MATCH, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_CODES_DONT_MATCH, EErrorTone);
 {
 queryAccepted = KErrCancel;
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
 // mix, max , alpha is handled using TARM params, in the dialog itself
 TInt lType = ESecUiAlphaSupported | ESecUiCancelSupported | ESecUiEmergencyNotSupported | secCodeType;
 RDEBUG("lType", lType);
 TBuf<0x100> title;
 title.Zero();
-HBufC* stringHolder = HbTextResolverSymbian::LoadLC(_L("txt_pin_code_dialog_new_sec_code"));
+HBufC* stringHolder = TranslateLC(_L("txt_devicelocking_dialog_new_lock_code"),0);
 title.Append(stringHolder->Des());
 CleanupStack::PopAndDestroy(stringHolder);
 title.Append(_L("|"));
-HBufC* stringHolder2 = HbTextResolverSymbian::LoadLC(_L("Verify"));
+HBufC* stringHolder2 = TranslateLC(_L("txt_devicelocking_dialog_retype_new_lock_code"),0);
 title.Append(stringHolder2->Des());
 CleanupStack::PopAndDestroy(stringHolder2);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, newPassword, SEC_C_SECURITY_CODE_MIN_LENGTH, SEC_C_SECURITY_CODE_MAX_LENGTH, lType);
 RDEBUG("newPassword", 0);
 RDEBUGSTR(newPassword);
 	        RDEBUG("scpClient.StoreLockcode", 0);
 	        // this is the old method. Obsolete now
 	        // scpClient.StoreCode( newCode );
 	        RArray<TDevicelockPolicies> aFailedPolicies;
 	        TDevicelockPolicies failedPolicy;
+	        failedPolicy = failedPolicy;
 	        RDEBUG("newScpCode", 0);
 	        RDEBUGSTR( newScpCode );
 	        RDEBUG("oldScpCode", 0);
 	        RDEBUGSTR( oldScpCode );
 	        RDEBUG( "StoreLockcode", 0 );
 	      	switch (res)
 		        {
 		        case KErrNone:
 		            {
 	            	RDEBUG( "showing R_SECURITY_CODE_CHANGED_NOTE", R_SECURITY_CODE_CHANGED_NOTE );
-	            	ShowResultNoteL(R_SECURITY_CODE_CHANGED_NOTE, CAknNoteDialog::EConfirmationTone);
+	            	ShowResultNoteL(R_SECURITY_CODE_CHANGED_NOTE, EConfirmationTone);
 		            break;
 		          	}
 		        case KErrAccessDenied:	// TARM has wrong UID
 		            {
 	          		res = KErrTDevicelockPolicies+EDevicelockTotalPolicies+1;
 	          		RDEBUG( "res", res );
-	          		ShowResultNoteL(res, CAknNoteDialog::EConfirmationTone);
+	          		ShowResultNoteL(res, EConfirmationTone);
 	          		res = KErrAccessDenied;	// no reason for retry, as it will fail again and again
 	          		break;
 	          		}
 		        case KErrGsmSSPasswordAttemptsViolation:
 		        case KErrLocked:
 		            {
 	          		RDEBUG( "KErrLocked", KErrLocked );
-		            ShowResultNoteL(R_SEC_BLOCKED, CAknNoteDialog::EErrorTone);
+		            ShowResultNoteL(R_SEC_BLOCKED, EErrorTone);
 		            goto askChangeSecCodeParamsL;
 		            // break;
 		            }
 		        case KErrGsm0707IncorrectPassword:
 		            {
 		            // code was entered erroneously
 	          		RDEBUG( "KErrGsm0707IncorrectPassword", KErrGsm0707IncorrectPassword );
-		            ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
+		            ShowResultNoteL(R_CODE_ERROR, EErrorTone);
 		            goto askChangeSecCodeParamsL;
 		            // break;
 		            }
 		        case KErrAbort:
 		            {
 EXPORT_C TInt CSecuritySettings::ChangeAutoLockPeriodParamsL(TInt aPeriod, RMobilePhone::TMobilePassword aOldPassword, TInt aFlags, TDes& aCaption, TInt aShowError)
 {
 askChangeAutoLockPeriodParamsL:
 RDEBUG("aPeriod", aPeriod);
 RDEBUG("aFlags", aFlags);
+(void)aOldPassword;
+(void)aCaption;
+(void)aShowError;
+(void)aFlags;
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 *****************************************************/
 RMobilePhone::TMobilePhoneLockSetting lockChange(RMobilePhone::ELockSetDisabled);
 RMobilePhone::TMobilePhoneLock lockType = RMobilePhone::ELockPhoneDevice;
 TInt oldPeriod = aPeriod;
+oldPeriod=oldPeriod;
 TInt maxPeriod = 0;
 if (FeatureManager::FeatureSupported(KFeatureIdSapTerminalControlFw))
 {
 // Retrieve the current autolock period max. value from the SCP server,
 {
 if ((aPeriod == 0) && (maxPeriod > 0))
 {
 RDEBUG("The period is not allowed by TARM", aPeriod);
 RDEBUG( "maxPeriod", maxPeriod );
-ShowResultNoteL(R_SECUI_TEXT_AUTOLOCK_MUST_BE_ACTIVE, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_SECUI_TEXT_AUTOLOCK_MUST_BE_ACTIVE, EErrorTone);
 return R_SECUI_TEXT_AUTOLOCK_MUST_BE_ACTIVE; // don't ask again. Settings will roll-back
 	}
 }
 if (aPeriod == 0)
 {
 case KErrNone:
 break;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
-RDEBUG("KErrLocked", KErrLocked)
+RDEBUG("KErrLocked", KErrLocked);
-;
+// ShowResultNoteL(KErrLocked, EErrorTone); // the old code didn't show messages. PassPhraseRequiredL does it.
-ShowResultNoteL(KErrLocked, CAknNoteDialog::EErrorTone); // the old code didn't show messages
 goto askChangeAutoLockPeriodParamsL; // ask again
 case KErrGsm0707IncorrectPassword:
 RDEBUG("KErrGsm0707IncorrectPassword", KErrGsm0707IncorrectPassword)
-ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone); // the old code didn't show messages
+// ShowResultNoteL(R_CODE_ERROR, EErrorTone); // the old code didn't show messages. PassPhraseRequiredL does it.
 goto askChangeAutoLockPeriodParamsL; // ask again
 case KErrAccessDenied:
 RDEBUG("KErrAccessDenied", KErrAccessDenied)
 ;
 // code was entered erroneously
-ShowResultNoteL(KErrAccessDenied, CAknNoteDialog::EErrorTone); // the old code didn't show messages
+// ShowResultNoteL(KErrAccessDenied, EErrorTone); // the old code didn't show messages. PassPhraseRequiredL does it.
 goto askChangeAutoLockPeriodParamsL; // ask again
 case KErrAbort:
 // User pressed "cancel" in the code query dialog.
 RDEBUG("KErrAbort", KErrAbort)
 return KErrAbort;
 default:
 RDEBUG("default", status)
 ;
-ShowResultNoteL(status, CAknNoteDialog::EErrorTone); // the old code didn't show messages
+// ShowResultNoteL(status, EErrorTone); // the old code didn't show messages. PassPhraseRequiredL does it.
 goto askChangeAutoLockPeriodParamsL; // ask again
 }
 RDEBUG("aPeriod", aPeriod);
 return aPeriod;
 }
 User::LeaveIfError(err);
 TBool simRemoved(simState == ESimNotPresent);
 if (simRemoved)
 {
-ShowResultNoteL(R_INSERT_SIM, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_INSERT_SIM, EErrorTone);
 return KErrAccessDenied;
 }
 RMobilePhone::TMobilePhoneLockInfoV1 lockInfo;
 RMobilePhone::TMobilePhoneLockInfoV1Pckg lockInfoPkg(lockInfo);
 break;
 }
 case KErrGsm0707OperationNotAllowed:
 {
 // not allowed with this sim
-ShowResultNoteL(R_OPERATION_NOT_ALLOWED, CAknNoteDialog::EErrorTone);
+ShowResultNoteL(R_OPERATION_NOT_ALLOWED, EErrorTone);
 return KErrGsm0707OperationNotAllowed;
 }
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
 {
 RDEBUG("aFlags", aFlags);
 RDEBUG("aShowError", aShowError);
 RDEBUG("This doesn't do anything", 0);
 RDEBUG("aFlags", aFlags);
+(void)aCaption;
+(void)aFlags;
+(void)aShowError;
 // the password parameters are not used
 if (aOldPassword.Length() > 0)
 RDEBUGSTR(aOldPassword);
 return EFalse;
 }
+//
+// ----------------------------------------------------------
+// CSecuritySettings::TranslateLC()
+// ----------------------------------------------------------
+// qtdone
+HBufC* CSecuritySettings::TranslateLC(const TDesC& aMessageId, TInt aFlags)
+{
+RDEBUG("aFlags", aFlags);
+RDEBUG("aMessageId", 1);
+(void)aFlags;
+_LIT(KPath, "z:/resource/qt/translations/");
+		TBool result=EFalse;
+		result=result;
+TBuf<0x100> title;
+title.Zero();
+		HBufC* stringHolder;
+RDEBUG("before stringHolder", 0);
+		stringHolder = HbTextResolverSymbian::LoadLC(aMessageId);
+RDEBUG("got stringHolder", 1);
+		title.Append(stringHolder->Des());
+RDEBUG("title", 0);
+RDEBUGSTR(title);
+		RDEBUG("searched in default", 1);
+		// this doesn't work because an error in HbTextResolverSymbian::Init
+		int doDoubleTranslations = 0;
+		RDEBUG("doDoubleTranslations", doDoubleTranslations);
+		if(doDoubleTranslations && !title.CompareF(aMessageId))
+			{
+			// not translated. Now check in common
+			// CleanupStack::PopAndDestroy(stringHolder);
+				RDEBUG("1", 1);
+			title.Zero();
+				RDEBUG("1", 1);
+	_LIT(KFileNameSecUi, "secui_");
+				RDEBUG("1", 1);
+	    result = HbTextResolverSymbian::Init(KFileNameSecUi, KPath);
+				RDEBUG("1", 1);
+	    RDEBUG("bool result", result);
+				RDEBUG("1", 1);
+			stringHolder = HbTextResolverSymbian::LoadLC(aMessageId);
+				RDEBUG("1", 1);
+			title.Append(stringHolder->Des());
+				RDEBUG("1", 1);
+			RDEBUG("searched in KFileNameSecUi", 1);
+			// RDEBUGSTR(aMessageId);
+			}
+				RDEBUG("1", 1);
+		if(doDoubleTranslations && !title.CompareF(aMessageId))
+			{
+				RDEBUG("1", 1);
+			// not translated. Now check in common
+			// CleanupStack::PopAndDestroy(stringHolder);
+				RDEBUG("1", 1);
+			title.Zero();
+				RDEBUG("1", 1);
+	_LIT(KFileNameCommon, "common_");
+				RDEBUG("1", 1);
+	    result = HbTextResolverSymbian::Init(KFileNameCommon, KPath);
+	    RDEBUG("bool result", result);
+			stringHolder = HbTextResolverSymbian::LoadLC(aMessageId);
+				RDEBUG("1", 1);
+			title.Append(stringHolder->Des());
+			RDEBUG("searched in KFileNameCommon", 1);
+			// RDEBUGSTR(aMessageId);
+			}
+		if(doDoubleTranslations && !title.CompareF(aMessageId))
+			{
+			// not translated. Now check in devicelocking
+				RDEBUG("1", 1);
+			CleanupStack::PopAndDestroy(stringHolder);
+				RDEBUG("1", 1);
+			title.Zero();
+				RDEBUG("1", 1);
+	_LIT(KFileNameDevicelocking, "devicelocking_");
+				RDEBUG("1", 1);
+	    result = HbTextResolverSymbian::Init(KFileNameDevicelocking, KPath);
+	    RDEBUG("bool result", result);
+			stringHolder = HbTextResolverSymbian::LoadLC(aMessageId);
+				RDEBUG("1", 1);
+			title.Append(stringHolder->Des());
+			RDEBUG("searched in KFileNameDevicelocking", 1);
+			// RDEBUGSTR(aMessageId);
+			}
+		// this is done by the caller: CleanupStack::PopAndDestroy(stringHolder);
+		RDEBUG("0x99", 0x99);
+		return stringHolder;
+}
 // End of file

changeset 66	67b3e3c1fc87
parent 63	989397f9511c