--- a/securitydialogs/simlockui/src/SimLockUIAppui.cpp Thu Jul 15 19:36:50 2010 +0300
+++ b/securitydialogs/simlockui/src/SimLockUIAppui.cpp Thu Aug 19 10:45:23 2010 +0300
@@ -30,6 +30,8 @@
#include <aknmessagequerydialog.h> // CAknMessageQueryDialog
#include <e32base.h>
#include <e32property.h> //Rproperty
+#include <rmmcustomapi.h> // TSimLockPassword
+
// Local Includes
#include "simlockisaserverdefinitions.h"
#include "simlockui.pan"
@@ -128,7 +130,8 @@
{
TBool keepLooping = ETrue;
- TBuf<SEC_ATT_PASSWORD_MAX_BUFFER> password;
+ RMmCustomAPI::TSimLockPassword password;
+
// Loop until flag is set
do
@@ -165,15 +168,7 @@
// ---------------------------------------------------------------------------
void CSimLockUIAppUi::CreateBackgroundControlL()
{
- CEikStatusPane* statusPane = StatusPane();
-
- // Remove status pane
- // Crop background pane to reveal idle status pane
- TRect background = ClientRect();
- statusPane->ReduceRect(background);
- statusPane->SwitchLayoutL(R_AVKON_STATUS_PANE_LAYOUT_EMPTY);
-
- iBackgroundControl = CSimLockUIBackgroundControl::NewL(background);
+ iBackgroundControl = CSimLockUIBackgroundControl::NewL();
AddToStackL(iBackgroundControl);
}
@@ -201,7 +196,7 @@
// ---------------------------------------------------------------------------
TBool CSimLockUIAppUi::PromptForPasswordL(TDes& aPassword)
{
- TBuf<SEC_ATT_PASSWORD_MAX_BUFFER> newPassword;
+ RMmCustomAPI::TSimLockPassword newPassword;
// Prompt for password twice. Loop until passwords match.
do
@@ -210,8 +205,6 @@
// Ask for password
CAknTextQueryDialog* dialog = CAknTextQueryDialog::NewL(aPassword);
- // dialog->SetMaxLength(SEC_ATT_PASSWORD_MAX_LENGTH);
-
if (!dialog->ExecuteLD(R_SIM_INFO_ENTER_PASSWORD))
{
return EFalse;
@@ -329,7 +322,8 @@
// ---------------------------------------------------------------------------
TBool CSimLockUIAppUi::HandleUnlockFailedL()
{
- TBuf<SEC_ATT_PASSWORD_MAX_BUFFER> password;
+ RMmCustomAPI::TSimLockPassword password;
+
// Otherwise, prompt user to try again
SetBackgroundTextL(EBackgroundTextEmpty);