FCL/sf/mw/btservices: comparison cbsatplugin/atmisccmdplugin/src/clckcommandhandler.cpp

equal deleted inserted replaced

-:53b7818cd282
+:95674584745d
 #include "cbsettinghandler.h"
 #include "atmisccmdpluginconsts.h"
 #include "debug.h"
-const TInt KSCPMaxHashLength( 32 );
 CCLCKCommandHandler* CCLCKCommandHandler::NewL(MATMiscCmdPlugin* aCallback, TAtCommandParser& aATCmdParser, RMobilePhone& aPhone)
 {
 TRACE_FUNC_ENTRY
 CCLCKCommandHandler* self = new (ELeave) CCLCKCommandHandler(aCallback, aATCmdParser, aPhone);
 CleanupStack::PushL(self);
 delete callBarringList;
 TRACE_FUNC_EXIT
 return KErrNone;
 }
-void CCLCKCommandHandler::HandleCommandCancel()
-{
-TRACE_FUNC_ENTRY
-Cancel();
-TRACE_FUNC_EXIT
-}
 void CCLCKCommandHandler::IssueCLCKCommand()
 {
 TRACE_FUNC_ENTRY
 Trace(KDebugPrintD, "iCLCKCommandType: ", iCLCKCommandType);
 iReply.Zero();
 SetActive();
 break;
 }
 case (CCLCKCommandHandler::ECLCKLockSet):
 {
-if (iPassword.Compare(KNullDesC8) == 0)
+if (iPassword.Length() == 0)
 {
 iCallback->CreateReplyAndComplete( EReplyTypeError);
 }
 else
 {
 // Set the property to ignore security events in other clients
 // it allows to avoid GUI promt for security code
 TInt  ret = KErrNone;
-// TODO: reenable when KIgnoreSecurityEvent propety definition is submitted to codeline
+if (iLockType == RMobilePhone::ELockICC)
-//                if (iLockType == RMobilePhone::ELockICC)
+{
-//                    {
+ret = RProperty::Set(KPSUidStartup, KIgnoreSecurityEvent, EPSIgnoreSecurityEventEPin1Required);
-//                    ret = RProperty::Set(KPSUidStartup, KIgnoreSecurityEvent, EPSIgnoreSecurityEventEPin1Required);
+}
-//                    }
+else
-//                else
+{
-//                    {
+ret = RProperty::Set(KPSUidStartup, KIgnoreSecurityEvent, EPSIgnoreSecurityEventEPhonePasswordRequired);
-//                    ret = RProperty::Set(KPSUidStartup, KIgnoreSecurityEvent, EPSIgnoreSecurityEventEPhonePasswordRequired);
+}
-//                    }
 Trace(KDebugPrintD, "RProperty::Set: ", ret);
 if (ret == KErrNone)
 {
 // Start security event handler - this will notify whether a
 // password is required to complete the set lock request.
 SetActive();
 break;
 }
 case (CCLCKCommandHandler::ECLCKBarringSet):
 {
-if (iPassword.Compare(KNullDesC8) == 0)
+if (iPassword.Length() == 0)
 {
 iCallback->CreateReplyAndComplete(EReplyTypeError);
 }
 else
 {
 }
 TInt CCLCKCommandHandler::ParseCCLCKCommand()
 {
 TRACE_FUNC_ENTRY
-TCmdFacilityType facilityType = ECmdFacilityTypeUnknown;
+TPtrC8 command;
-TInt mode = 0;
+TInt ret = iATCmdParser.NextTextParam(command);
-TInt ret = KErrNone;
+if (ret != KErrNone)
-TPtrC8 command = iATCmdParser.NextTextParam(ret);
-if (!command.Compare(KNullDesC8) || ret != KErrNone)
 {
 TRACE_FUNC_EXIT
 return KErrArgument;
 }
+TInt mode = 0;
 ret = iATCmdParser.NextIntParam(mode);
-if (!command.Compare(KNullDesC8) || ret != KErrNone)
+if (ret != KErrNone)
 {
 TRACE_FUNC_EXIT
 return KErrArgument;
 }
-iPassword.Create(iATCmdParser.NextTextParam(ret));
+TPtrC8 tmpPwd;
-Trace(KDebugPrintD, "NextTextParam returned: ", ret);
+ret = iATCmdParser.NextTextParam(tmpPwd);
 if (ret != KErrNone && ret != KErrNotFound)
 {
 TRACE_FUNC_EXIT
 return KErrArgument;
 }
-if (iPassword.Compare(KNullDesC8) != 0)
+iPassword.Create(tmpPwd);
-{
+if (iPassword.Length() != 0)
-ret = iATCmdParser.NextIntParam(iInfoClass);
+{
-Trace(KDebugPrintD, "NextIntParam(iInfoClass): ", ret);
+ret = iATCmdParser.NextIntParam(iInfoClass);;
 if (ret == KErrNotFound)
 {
-iInfoClass = 7;
+iInfoClass = 7; // Default value, see ETSI TS 127 007 V6.9.0 (2007-06)
 }
-if ((ret != KErrNone && ret != KErrNotFound ) ||
+else if (ret != KErrNone || iATCmdParser.NextParam().Length() != 0)
-iATCmdParser.NextParam().Compare(KNullDesC8) != 0)
 {
 TRACE_FUNC_EXIT
 return KErrArgument;
 }
 }
-if (command.Compare(KATCLCKPS) == 0)
+TCmdFacilityType facilityType = ECmdFacilityTypeUnknown;
+if (command.CompareF(KATCLCKPS) == 0)
 {
 // Lock phone to SIM on/off
 iSecurityCode = RMobilePhone::ESecurityCodePhonePassword;
 iLockType = RMobilePhone::ELockPhoneToICC;
 facilityType = ECmdFacilityTypeLock;
 }
-else if (command.Compare(KATCLCKSC) == 0)
+else if (command.CompareF(KATCLCKSC) == 0)
 {
 // PIN on/off
 iSecurityCode = RMobilePhone::ESecurityCodePin1;
 iLockType = RMobilePhone::ELockICC;
 facilityType = ECmdFacilityTypeLock;
 }
-else if (command.Compare(KATCLCKAO) == 0)
+else if (command.CompareF(KATCLCKAO) == 0)
 {
 iCondition = RMobilePhone::EBarAllOutgoing;
 facilityType = ECmdFacilityTypeBarring;
 }
-else if (command.Compare(KATCLCKOI) == 0)
+else if (command.CompareF(KATCLCKOI) == 0)
 {
 iCondition = RMobilePhone::EBarOutgoingInternational;
 facilityType = ECmdFacilityTypeBarring;
 }
-else if (command.Compare(KATCLCKOX) == 0)
+else if (command.CompareF(KATCLCKOX) == 0)
 {
 iCondition = RMobilePhone::EBarOutgoingInternationalExHC;
 facilityType = ECmdFacilityTypeBarring;
 }
-else if (command.Compare(KATCLCKAI) == 0)
+else if (command.CompareF(KATCLCKAI) == 0)
 {
 iCondition = RMobilePhone::EBarAllIncoming;
 facilityType = ECmdFacilityTypeBarring;
 }
-else if (command.Compare(KATCLCKIR) == 0)
+else if (command.CompareF(KATCLCKIR) == 0)
 {
 iCondition = RMobilePhone::EBarIncomingRoaming;
 facilityType = ECmdFacilityTypeBarring;
 }
-else if (command.Compare(KATCLCKAB) == 0)
+else if (command.CompareF(KATCLCKAB) == 0)
 {
 iCondition = RMobilePhone::EBarAllCases;
 facilityType = ECmdFacilityTypeAllBarring;
 }
-else if (command.Compare(KATCLCKAG) == 0)
+else if (command.CompareF(KATCLCKAG) == 0)
 {
 iCondition = RMobilePhone::EBarAllOutgoingServices;
 facilityType = ECmdFacilityTypeAllBarring;
 }
-else if (command.Compare(KATCLCKAC) == 0)
+else if (command.CompareF(KATCLCKAC) == 0)
 {
 iCondition = RMobilePhone::EBarAllIncomingServices;
 facilityType = ECmdFacilityTypeAllBarring;
 }
 else
 break;
 }
 case (ECmdFacilityTypeBarring):
 {
 iCBInfo.iPassword.Copy(iPassword);
-if (iInfoClass == 0)
-{
-iInfoClass = 7; // Default value, see ETSI TS 127 007 V6.9.0 (2007-06)
-}
 switch (mode)
 {
 case 0: // AT+CLCK="AO",0
 {
 iCLCKCommandType = ECLCKBarringSet;

branch	RCL_3
changeset 35	95674584745d
parent 16	b23265fb36da
child 40	997690c3397a