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

equal deleted inserted replaced

-:25a3fbb5e4d3
+:1cc4c46c2963
 RMobilePhone::TMobilePassword securityCode;
 RMobilePhone::TMobilePassword unblockCode; // Required here only as a dummy parameter
 		/* TODO not sure if needs to check against the typed, or the hashed */
-		/*
 RArray<TDevicelockPolicies> aFailedPolicies;
-TDevicelockPolicies failedPolicy;
 TInt retLockcode = KErrNone;
 RMobilePhone::TMobilePassword aISACode;
 TInt scpFlags = 0;
 RDEBUG("scpClient.VerifyCurrentLockcode", 0);
-// this validate on ISA . No need to do iPhone.VerifySecurityCode
+// get hashed code, to verify that message is different than code
+RSCPClient scpClient;
+TInt ret = scpClient.Connect();
+RDEBUG("ret", ret);
 retLockcode = scpClient.VerifyCurrentLockcode(aRemoteLockCode, aISACode, aFailedPolicies, scpFlags);
 RDEBUG("retLockcode", retLockcode);
+	  scpClient.Close();
 RDEBUG("aISACode", 0);
 RDEBUGSTR(aISACode);
-		*/
+securityCode = aISACode;	// aRemoteLockCode;
-securityCode = aRemoteLockCode;
 RDEBUG( "EMobilePhoneVerifySecurityCode", EMobilePhoneVerifySecurityCode );
 iWait->SetRequestType(EMobilePhoneVerifySecurityCode);
 RDEBUG( "VerifySecurityCode", 0 );
 iPhone.VerifySecurityCode(iWait->iStatus, secCodeType, securityCode, unblockCode);
 RDEBUG( "WaitForRequestL", 0 );
 }
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
 // code was entered erroneously
+				RDEBUG("KErrAccessDenied", KErrAccessDenied);
 return ChangeSimSecurityL();
 }
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 {
+				RDEBUG("KErrLocked", KErrLocked);
 return ChangeSimSecurityL();
 }
 case KErrAbort:
 {
+				RDEBUG("KErrAbort", KErrAbort);
 return EFalse;
 }
 default:
 {
+				RDEBUG("default", status);
 ShowErrorNoteL(status);
 return ChangeSimSecurityL();
 }
 }
 break;
 case KErrTDevicelockPolicies+EDevicelockTotalPolicies+1:
 titleTr.Append(_L("SCP server doesn't support this UID"));
 title.Append(_L("SCP server doesn't support this UID"));
 break;
+case KErrGsm0707SIMPuk1Required:
+titleTr.Append(_L("KErrGsm0707SIMPuk1Required"));
+title.Append(_L("Puk 1 Required"));
+break;
 default: // " "
 titleTr.Append(_L("Specific Error"));
 title.Append(_L("Specific Error"));
 break;
 /**************************/
 // qtdone
 EXPORT_C TInt CSecuritySettings::ChangePinParamsL(RMobilePhone::TMobilePassword aOldPassword, RMobilePhone::TMobilePassword aNewPassword, TInt aFlags, TDes& aCaption,
 TInt aShowError)
 {
+askChangePinParamsL:
 RDEBUG("aFlags", aFlags);
 RDEBUG("aOldPassword", 0);
 RDEBUGSTR(aOldPassword);
 RDEBUG("aNewPassword", 0);
 RDEBUGSTR(aNewPassword);
 {
 lockInfo.iSetting = RMobilePhone::ELockSetEnabled;
 res = KErrNone;
 }
 #endif
+		if(res==KErrGsm0707SIMPuk1Required)
+				{
+CSecurityHandler* handler = new (ELeave) CSecurityHandler(iPhone);
+CleanupStack::PushL(handler);
+handler->HandleEventL(RMobilePhone::EPuk1Required);
+CleanupStack::PopAndDestroy(handler); // handler
+				}
 User::LeaveIfError(res);
 if (lockInfo.iSetting == RMobilePhone::ELockSetDisabled)
 {
 RDEBUG("RMobilePhone::ELockSetDisabled",
 res = KErrNone;
 #endif
 if (res != KErrNone)
 {
 ShowResultNoteL(res, CAknNoteDialog::EErrorTone);
-return res; // not sure if it's wise to exit now.
+		        newPassword = _L("");
+		        oldPassword = _L("");
+goto askChangePinParamsL;
 }
 newPassword = _L("");
 }
 else
 case KErrGsm0707IncorrectPassword:
 case KErrAccessDenied:
 {
 // code was entered erroneously. This is strange, because it was verified before
 ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
-ChangePinParamsL(_L(""), _L(""), aFlags, aCaption, aShowError);
+goto askChangePinParamsL;
-break;
 }
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 {
 // Pin1 blocked!
 {
 break;
 }
 default:
 {
+RDEBUG("default", res);
 ShowErrorNoteL(res);
-ChangePinParamsL(_L(""), _L(""), aFlags, aCaption, aShowError);
+goto askChangePinParamsL;
-break;
 }
 }
 return res;
 }
 /*********************************************/
 /************************************************/
 // qtdone
 EXPORT_C TInt CSecuritySettings::ChangeSecCodeParamsL(RMobilePhone::TMobilePassword aOldPassword, RMobilePhone::TMobilePassword aNewPassword, TInt aFlags, TDes& aCaption,
 TInt aShowError)
 {
+askChangeSecCodeParamsL:
 RDEBUG("aFlags", aFlags);
 RDEBUG("aShowError", aShowError);
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 		// confirm that it can be changed now
 		{
 RArray<TDevicelockPolicies> aFailedPolicies;
 TDevicelockPolicies failedPolicy;
-TInt retLockcode = KErrNone;
 RSCPClient scpClient;
-retLockcode = scpClient.Connect();
+res = scpClient.Connect();
-RDEBUG( "retLockcode", retLockcode );
+RDEBUG( "res", res );
-if(retLockcode == KErrNone )
+if(res == KErrNone )
 	{
 	       RDEBUG( "scpClient.VerifyNewLockcodeAgainstPolicies", 0 );
-	       retLockcode = scpClient.IsLockcodeChangeAllowedNow( aFailedPolicies );
+	       TBool changeAllowed = scpClient.IsLockcodeChangeAllowedNow( aFailedPolicies );
-	       RDEBUG( "retLockcode", retLockcode );
+	       RDEBUG( "bool changeAllowed", changeAllowed );
 	       RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() );
-	       res = retLockcode;
+	       if(changeAllowed)
+	       	res = KErrNone;
+	       else
+	       	res = KErrAccessDenied;
 	       for(TInt i=0; i<aFailedPolicies.Count(); i++)
 		       {
 		       failedPolicy = aFailedPolicies[i];
 		       RDEBUG( "failedPolicy", failedPolicy );
 		       // it could also be res = KErrGsm0707IncorrectPassword;
 		       res = KErrTDevicelockPolicies + failedPolicy;
 		       }
 	     	 scpClient.Close();
-	     	 if(retLockcode!=KErrNone)
+	     	 if(res!=KErrNone)
 	     	 		{
 	     	 		ShowResultNoteL(res, CAknNoteDialog::EErrorTone);
 	 	 		return res;
 	 	 		}
 				}
 			else
 				{
-					RDEBUG( "failed connecting to SCP", retLockcode );
+					RDEBUG( "failed connecting to SCP", res );
 					// what to do? let's assume that we don't need special policies.
 				}
 		}
 RDEBUG("aOldPassword.Length()", aOldPassword.Length());
 			 // Confirm that the new code is nice.
 			 // This is also done on every key-press in the dialog, but it doesn't harm to repeat.
 			 // In fact this is needed for the case when newPassword is provided.
 RArray<TDevicelockPolicies> aFailedPolicies;
 TDevicelockPolicies failedPolicy;
-TInt retLockcode = KErrNone;
 RSCPClient scpClient;
-retLockcode = scpClient.Connect();
+res = scpClient.Connect();
-RDEBUG( "retLockcode", retLockcode );
+RDEBUG( "res", res );
-if(retLockcode == KErrNone )
+if(res == KErrNone )
 	{
 	       RDEBUG( "scpClient.VerifyNewLockcodeAgainstPolicies", 0 );
 	       RDEBUGSTR( newPassword );
-	       retLockcode = scpClient.VerifyNewLockcodeAgainstPolicies( newPassword, aFailedPolicies );
+	       res = scpClient.VerifyNewLockcodeAgainstPolicies( newPassword, aFailedPolicies );
-	       RDEBUG( "retLockcode", retLockcode );
+	       RDEBUG( "res", res );
 	       RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() );
 	       for(TInt i=0; i<aFailedPolicies.Count(); i++)
 		       {
 		       failedPolicy = aFailedPolicies[i];
 		       RDEBUG( "failedPolicy", failedPolicy );
 		       }
 	     	 scpClient.Close();
 				}
 			else
 				{
-					RDEBUG( "failed connecting to SCP", retLockcode );
+					RDEBUG( "failed connecting to SCP", res );
 					// what to do? let's assume that we don't need special policies.
 				}
 // change code
 RDEBUG("res", res);
-if (res == KErrNone)
+// let's see if TARM rejects it
-{
+if(res==KErrNone)
-passwords.iOldPassword = oldPassword;
+	    {
-passwords.iNewPassword = newPassword;
+	    // Send the changed code to the SCP server, even with device lock enhancements.
-iWait->SetRequestType(EMobilePhoneChangeSecurityCode);
+	    RDEBUG("scpClient.Connect", 0);
-RDEBUG("ChangeSecurityCode", 0);
+	    RSCPClient scpClient;
-iPhone.ChangeSecurityCode(iWait->iStatus, secCodeType, passwords);
+	    TBuf<32> newScpCode;
-RDEBUG("WaitForRequestL", 0);
+	    TBuf<32> oldScpCode;
-res = iWait->WaitForRequestL();
+	    newScpCode.Copy(newPassword);
-RDEBUG("WaitForRequestL res", res);
+	    oldScpCode.Copy(oldPassword);
-#ifdef __WINS__
+	    if (scpClient.Connect() == KErrNone)
-if (res == KErrNotSupported)
+	        {
-res = KErrNone;
+	        RDEBUG("scpClient.StoreLockcode", 0);
-#endif
+	        // this is the old method. Obsolete now
+	        // scpClient.StoreCode( newCode );
-if (res == KErrNone && 1 == 0) // TODO not possible to enable because it asks code again
+	        RArray<TDevicelockPolicies> aFailedPolicies;
-{
+	        TDevicelockPolicies failedPolicy;
-RMobilePhone::TMobilePhoneLock lockType = RMobilePhone::ELockPhoneDevice;
+	        RDEBUG("newScpCode", 0);
-RMobilePhone::TMobilePhoneLockSetting lockChangeSetting = RMobilePhone::ELockSetEnabled;
+	        RDEBUGSTR( newScpCode );
-iWait->SetRequestType(EMobilePhoneSetLockSetting);
+	        RDEBUG("oldScpCode", 0);
-RDEBUG("SetLockSetting", 0);
+	        RDEBUGSTR( oldScpCode );
-iPhone.SetLockSetting(iWait->iStatus, lockType, lockChangeSetting);
+	        RDEBUG( "StoreLockcode", 0 );
-RDEBUG("WaitForRequestL", 0);
+	        res = scpClient.StoreLockcode(newScpCode, oldScpCode, aFailedPolicies);	// this does iPhone.ChangeSecurityCode
-res = iWait->WaitForRequestL();
+	        RDEBUG( "res", res );
-RDEBUG("WaitForRequestL res", res);
+	        RDEBUG( "KErrAccessDenied", KErrAccessDenied );
-#ifdef __WINS__
+					#ifdef __WINS__
-if (res == KErrNotSupported || res == KErrTimedOut)
+	        if (res == KErrNotSupported)
-res = KErrNone;
+	            res = KErrNone;
-#endif
+					#endif
-}
+	        RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() );
-}
+	        for (TInt i = 0; i < aFailedPolicies.Count(); i++)
+	            {
-RDEBUG("res", res);
+	            failedPolicy = aFailedPolicies[i];
-switch (res)
+	            RDEBUG( "failedPolicy", failedPolicy );
-{
+	            }
-case KErrNone:
+	        scpClient.Close();
-{
+	        // Don't know what to do if TARM fails. Hopefully it was stopped at typing, as well as VerifyNewLockcodeAgainstPolicies
-// code changed ... unless TARM rejects it
+	      	switch (res)
-{
+		        {
-// Send the changed code to the SCP server, even with device lock enhancements.
+		        case KErrNone:
-RDEBUG("scpClient.Connect", 0);
+		            {
-RSCPClient scpClient;
+	            	RDEBUG( "showing R_SECURITY_CODE_CHANGED_NOTE", R_SECURITY_CODE_CHANGED_NOTE );
-TSCPSecCode newScpCode;
+	            	ShowResultNoteL(R_SECURITY_CODE_CHANGED_NOTE, CAknNoteDialog::EConfirmationTone);
-TSCPSecCode oldScpCode;
+		            break;
-newScpCode.Copy(newPassword);
+		          	}
-oldScpCode.Copy(oldPassword);
+		        case KErrAccessDenied:	// TARM has wrong UID
-if (scpClient.Connect() == KErrNone)
+		            {
-{
+	          		res = KErrTDevicelockPolicies+EDevicelockTotalPolicies+1;
-RDEBUG("scpClient.StoreLockcode", 0);
+	          		RDEBUG( "res", res );
-// this is the old method. Obsolete now
+	          		ShowResultNoteL(res, CAknNoteDialog::EConfirmationTone);
-// scpClient.StoreCode( newCode );
+	          		res = KErrAccessDenied;	// no reason for retry, as it will fail again and again
-RArray<TDevicelockPolicies> aFailedPolicies;
+	          		break;
-TDevicelockPolicies failedPolicy;
+	          		}
-TInt retLockcode = KErrNone;
+		        case KErrGsmSSPasswordAttemptsViolation:
-RDEBUG("newScpCode", 0);
+		        case KErrLocked:
-RDEBUGSTR( newScpCode );
+		            {
-RDEBUG("oldScpCode", 0);
+	          		RDEBUG( "KErrLocked", KErrLocked );
-RDEBUGSTR( oldScpCode );
+		            ShowResultNoteL(R_SEC_BLOCKED, CAknNoteDialog::EErrorTone);
-retLockcode = scpClient.StoreLockcode(newScpCode, oldScpCode, aFailedPolicies);
+		            goto askChangeSecCodeParamsL;
-RDEBUG( "retLockcode", retLockcode );
+		            // break;
-RDEBUG( "KErrAccessDenied", KErrAccessDenied );
+		            }
-RDEBUG( "aFailedPolicies.Count()", aFailedPolicies.Count() );
+		        case KErrGsm0707IncorrectPassword:
-for (TInt i = 0; i < aFailedPolicies.Count(); i++)
+		            {
-{
+		            // code was entered erroneously
-failedPolicy = aFailedPolicies[i];
+	          		RDEBUG( "KErrGsm0707IncorrectPassword", KErrGsm0707IncorrectPassword );
-RDEBUG( "failedPolicy", failedPolicy );
+		            ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
-}
+		            goto askChangeSecCodeParamsL;
-// Don't know what to do if TARM fails. Hopefully it was stopped at typing, as well as VerifyNewLockcodeAgainstPolicies
+		            // break;
-// The code is already changed in iPhone !
+		            }
-// For now, just undo the changed password
+		        case KErrAbort:
-if(retLockcode!=KErrNone)
+		            {
-	{
+	          		RDEBUG( "KErrAbort", KErrAbort );
-	RDEBUG("Undo password change because retLockcode", retLockcode);
+		            break;
-	if(retLockcode==KErrAccessDenied)	// this happens if CSCPSession::HandleAuthenticationMessageL doesn't include the UID
+		            }
-		retLockcode = KErrTDevicelockPolicies+EDevicelockTotalPolicies+1;
+		        default:
-	ShowResultNoteL(retLockcode, CAknNoteDialog::EConfirmationTone);
+		            {
+		            ShowErrorNoteL(res);
-	// go back to previous password.
+		            goto askChangeSecCodeParamsL;
-	           	        passwords.iOldPassword = newPassword;
+		            // break;
-							        passwords.iNewPassword = oldPassword;
+		            }
-							        iWait->SetRequestType(EMobilePhoneChangeSecurityCode);
+		          }	// switch
-							        RDEBUG("ChangeSecurityCode", 0);
+	        }	// scpClient.Connect
-							        iPhone.ChangeSecurityCode(iWait->iStatus, secCodeType, passwords);
+	    }
-							        RDEBUG("WaitForRequestL", 0);
-							        res = iWait->WaitForRequestL();	// this can't fail. ISA is always allowing to undo the password change.
-							        RDEBUG("WaitForRequestL res", res);
-											#ifdef __WINS__
-							        if (res == KErrNotSupported)
-							            res = KErrNone;
-											#endif
-	                    res = retLockcode;
-	                    }
-scpClient.Close();
-}
-if(res==KErrNone)
-	{
-	RDEBUG( "showing R_SECURITY_CODE_CHANGED_NOTE", R_SECURITY_CODE_CHANGED_NOTE );
-	ShowResultNoteL(R_SECURITY_CODE_CHANGED_NOTE, CAknNoteDialog::EConfirmationTone);
-	}
-}
-break;
-}
-case KErrGsmSSPasswordAttemptsViolation:
-case KErrLocked:
-{
-ShowResultNoteL(R_SEC_BLOCKED, CAknNoteDialog::EErrorTone);
-ChangeSecCodeParamsL(aOldPassword, aNewPassword, aFlags, aCaption, aShowError);
-break;
-}
-case KErrGsm0707IncorrectPassword:
-case KErrAccessDenied:
-{
-// code was entered erroneously
-ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone);
-ChangeSecCodeParamsL(aOldPassword, aNewPassword, aFlags, aCaption, aShowError);
-break;
-}
-case KErrAbort:
-{
-break;
-}
-default:
-{
-ShowErrorNoteL(res);
-ChangeSecCodeParamsL(aOldPassword, aNewPassword, aFlags, aCaption, aShowError);
-break;
-}
-} // switch
 RDEBUG("return res", res);
 return res;
 }
 /**************************************/
 // qtdone
 // the params are changed in the settings,. This only asks for password.
 EXPORT_C TInt CSecuritySettings::ChangeAutoLockPeriodParamsL(TInt aPeriod, RMobilePhone::TMobilePassword aOldPassword, TInt aFlags, TDes& aCaption, TInt aShowError)
 {
+askChangeAutoLockPeriodParamsL:
 RDEBUG("aPeriod", aPeriod);
 RDEBUG("aFlags", aFlags);
 /*****************************************************
 *    Series 60 Customer / ETel
 *    Series 60  ETel API
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 RDEBUG("KErrLocked", KErrLocked)
 ;
 ShowResultNoteL(KErrLocked, CAknNoteDialog::EErrorTone); // the old code didn't show messages
-return ChangeAutoLockPeriodParamsL(oldPeriod, aOldPassword, aFlags, aCaption, aShowError); // ask again
+goto askChangeAutoLockPeriodParamsL; // ask again
 case KErrGsm0707IncorrectPassword:
+RDEBUG("KErrGsm0707IncorrectPassword", KErrGsm0707IncorrectPassword)
+ShowResultNoteL(R_CODE_ERROR, CAknNoteDialog::EErrorTone); // the old code didn't show messages
+goto askChangeAutoLockPeriodParamsL; // ask again
 case KErrAccessDenied:
 RDEBUG("KErrAccessDenied", KErrAccessDenied)
 ;
 // code was entered erroneously
 ShowResultNoteL(KErrAccessDenied, CAknNoteDialog::EErrorTone); // the old code didn't show messages
-return ChangeAutoLockPeriodParamsL(oldPeriod, aOldPassword, aFlags, aCaption, aShowError); // ask again
+goto askChangeAutoLockPeriodParamsL; // ask again
 case KErrAbort:
 // User pressed "cancel" in the code query dialog.
-return oldPeriod;
+RDEBUG("KErrAbort", KErrAbort)
+return KErrAbort;
 default:
 RDEBUG("default", status)
 ;
 ShowResultNoteL(status, CAknNoteDialog::EErrorTone); // the old code didn't show messages
-return ChangeAutoLockPeriodParamsL(oldPeriod, aOldPassword, aFlags, aCaption, aShowError); // ask again
+goto askChangeAutoLockPeriodParamsL; // ask again
 }
 RDEBUG("aPeriod", aPeriod);
 return aPeriod;
 }
 /*****************************/

changeset 61	1cc4c46c2963
parent 56	25a3fbb5e4d3