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

equal deleted inserted replaced

-:7bad16cccaca
+:e0432375ea67
 if (iDestroyedPtr)
 {
 *iDestroyedPtr = ETrue;
 iDestroyedPtr = NULL;
 }
-CancelSecCodeQuery();
+RDEBUG("calling CancelOpenQuery", 0);
+TInt err = CancelOpenQuery(-1);
+RDEBUG("err", err);
 iCustomPhone.Close();
 FeatureManager::UnInitializeLib();
+	RDEBUG("1", 1);
 }
 //
 // ----------------------------------------------------------
 // CSecurityHandler::HandleEventL()
 // Handles different security events
 // code is the default one; no need to request it.
 return ETrue;
 }
 /* end check for default code */
-iQueryCanceled = EFalse;
 RMobilePhone::TMobilePassword required_fourth;
 TInt ret = KErrNone;
 TInt status = KErrNone;
 /* request PIN using QT */
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+				iQueryCanceled = EFalse;
 lAlphaSupported = ESecUiAlphaSupported;
 lCancelSupported = ESecUiCancelSupported;
 TBuf<0x100> title;
 title.Zero();
 title.Append(_L("AskSecCodeL"));
 | lAlphaSupported | lCancelSupported
 | secCodeType );
 RDEBUG("iSecUi_password", 0);
 RDebug::Print(iSecUi_password);
 RDEBUG("delete", 0);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 /* end request PIN using QT */
 if (queryAccepted != KErrNone)
 {
 CleanupStack::PopAndDestroy(); //scpClient
 queryAccepted = KErrNone;
 }
-iQueryCanceled = ETrue; // TODO
+iQueryCanceled = ETrue;
 return ETrue;
 }
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 {
 iQueryCanceled = ETrue;
 return ret;
 }
 //
 // ----------------------------------------------------------
+// Cancels all security code queries
+// aStatus = -1		from destructor
+// aStatus =  1		from API. Will kill all dialogs through signal P&S
+// ----------------------------------------------------------
+// qtdone
+TInt CSecurityHandler::CancelOpenQuery(TInt aStatus)
+{
+		RDEBUG("aStatus", aStatus);
+		RDEBUG("iQueryCanceled", iQueryCanceled);
+		TInt res = 0;
+		if(aStatus==1)	// also signal all other dialogs
+				{
+				RDEBUG("set KSecurityUIsDismissDialog to ESecurityUIsDismissDialogOn", ESecurityUIsDismissDialogOn);
+		    TInt err = RProperty::Set(KPSUidSecurityUIs, KSecurityUIsDismissDialog, ESecurityUIsDismissDialogOn );
+		    RDEBUG("err", err);
+		    res += 1;
+			  }
+if (!iQueryCanceled)
+{
+				// notify all dialogs, in particular SecUiNotificationDialog::subscriberKSecurityUIsDismissDialogChanged
+				// this will cancel only the dialog which was opened by same client.
+		res += 0x10;
+iQueryCanceled = ETrue;
+if (iSecurityDlg != NULL)
+{
+RDEBUG("deleting iSecurityDlg", 0);
+		    		res += 0x100;
+delete iSecurityDlg;
+}
+if (iNoteDlg != NULL)
+{
+RDEBUG("deleting iNoteDlg", 0);
+		    		res += 0x1000;
+delete iNoteDlg;
+}
+iNoteDlg = NULL;
+iSecurityDlg = NULL;
+}
+		res += 0x10000;
+		RDEBUG("res", res);
+		return res;
+		}
+//
+// ----------------------------------------------------------
 // CSecurityHandler::CancelSecCodeQuery()
 // Cancels PIN2 and security code queries
 // this is used by rfsHandler
 // ----------------------------------------------------------
 // qtdone
 EXPORT_C void CSecurityHandler::CancelSecCodeQuery()
 {
 		RDEBUG("0", 0);
-		// notify all dialogs, in particular SecUiNotificationDialog::subscriberKSecurityUIsDismissDialogChanged
-TInt err = RProperty::Set(KPSUidSecurityUIs, KSecurityUIsDismissDialog, ESecurityUIsDismissDialogOn );
+		TInt err = CancelOpenQuery(1);
-RDEBUG("err", err);
-		RDEBUG("iQueryCanceled", iQueryCanceled);
+		RDEBUG("err", err);
-if (!iQueryCanceled)
-{
-iQueryCanceled = ETrue;
-if (iSecurityDlg != NULL)
-{
-delete iSecurityDlg;
-}
-if (iNoteDlg != NULL)
-{
-delete iNoteDlg;
-}
-iNoteDlg = NULL;
-iSecurityDlg = NULL;
-}
 }
 //
 // ----------------------------------------------------------
 // CSecurityHandler::AskSecCodeInAutoLock()
 // for asking security code in autolock
 case KErrAccessDenied:
 {
 RDEBUG("KErrAccessDenied", KErrAccessDenied);
 return AskSecCodeInAutoLockL();
 }
+case KErrInUse:
+{
+		RDEBUG("KErrInUse", KErrInUse);
+		return EFalse;
+}
+case KErrDied :
+{
+		RDEBUG("KErrDied ", KErrDied );
+		return EFalse;
+}
+case KErrServerTerminated :
+{
+		RDEBUG("KErrServerTerminated ", KErrServerTerminated );
+		return EFalse;
+}
+case KErrServerBusy :
+{
+		RDEBUG("KErrServerBusy ", KErrServerBusy );
+		return EFalse;
+}
 case KErrAbort:
+{
+		RDEBUG("KErrAbort", KErrAbort);
+		return EFalse;
+}
 case KErrCancel:
+{
+		RDEBUG("KErrCancel", KErrCancel);
 // user pressed "cancel"
 return EFalse;
+}
 default:
 {
 RDEBUG("default", res);
 return AskSecCodeInAutoLockL();
 }
 lEmergencySupported = ESecUiEmergencyNotSupported;
 }
 CSecQueryUi *iSecQueryUi;
 iSecQueryUi = CSecQueryUi::NewL();
+		iQueryCanceled = EFalse;
 TInt lType = ESecUiSecretSupported | ESecUiAlphaSupported
 | lCancelSupported | lEmergencySupported | secCodeTypeToAsk;
 RDEBUG("lType", lType);
 queryAccepted = iSecQueryUi->SecQueryDialog(_L("PassPhraseRequiredL"),
 iSecUi_password, SEC_C_SECURITY_CODE_MIN_LENGTH,
 SEC_C_SECURITY_CODE_MAX_LENGTH, lType);
 RDEBUG("iSecUi_password", 0);
 RDebug::Print(iSecUi_password);
 RDEBUG("queryAccepted", queryAccepted);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 TBool wasCancelledOrEmergency = EFalse;
 RDEBUG("KFeatureIdSapDeviceLockEnhancements",
 KFeatureIdSapDeviceLockEnhancements);
 if (err != KErrNone)
 {
 						RDEBUG("FAILED to get the SECUI query Flag err", err);
 }
 }
-RDEBUG("StartUp", StartUp);
+RDEBUG("err", err);
 RDEBUG("secUiOriginatedQuery", secUiOriginatedQuery);
 RDEBUG("ESecurityUIsSecUIOriginated", ESecurityUIsSecUIOriginated);
-RDEBUG("err", err);
 if (StartUp || (secUiOriginatedQuery != ESecurityUIsSecUIOriginated)
 || (err != KErrNone))
 {
 RDEBUG("0", 0);
 lCancelSupported = ESecUiCancelNotSupported;
 /* request PIN using QT */
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+		iQueryCanceled = EFalse;
 RDEBUG("SecQueryDialog", 1);
-// TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
+// ESecUiCodeEtelReqest/ESecUiNone might be useful
-// TODO also support Emergency
 lAlphaSupported = ESecUiAlphaNotSupported;
 TBuf<0x100> title;
 title.Zero();
 title.Append(_L("Pin1RequiredL"));
 title.Append(_L("#"));
 RDEBUG("amode", amode);
 queryAccepted = iSecQueryUi->SecQueryDialog(title, iSecUi_password,
 SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, amode);
 RDEBUG("iSecUi_password", 0);
 RDebug::Print(iSecUi_password);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
-// TODO handle emergency
 /* end request PIN using QT */
 if (queryAccepted == KErrAbort) // emergency call
 {
 				RDEBUG("queryAccepted", queryAccepted);
 }
 break;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 // code blocked; show error note and terminate.
-// TODO what if not during Startup? Probably it's Ok since the SIM would had also failed at StartUp
+// what if not during Startup? Probably it's Ok since the SIM would had also failed at StartUp
 if (StartUp)
 CSecuritySettings::ShowResultNoteL(R_CODE_ERROR,
 CAknNoteDialog::EErrorTone);
 break;
 case KErrGsm0707SimWrong:
 // sim lock active
-// TODO no error? This is strange
+// no error? This is strange
 break;
 default:
 CSecuritySettings::ShowErrorNoteL(res);
 if (StartUp)
 {
 RDEBUG("WaitForRequestL", 0);
 res = wait->WaitForRequestL();
 RDEBUG("WaitForRequestL res", res);
 }
 		RDEBUG("res", res);
-//If there's still an error we're doomed. Bail out.
+// If there's still an error we're doomed. Bail out.
 User::LeaveIfError(res);
 RDEBUG("StartUp", StartUp);
 RDEBUG("codeInfo.iRemainingEntryAttempts",
 codeInfo.iRemainingEntryAttempts);
 	TInt attempts(codeInfo.iRemainingEntryAttempts);
 	RDEBUG( "attempts", attempts );
-//show the last "Code Error" note of PIN verify result here so it won't be left under the PUK1 dialog
+// show the last "Code Error" note of PIN verify result here so it won't be left under the PUK1 dialog
 if (!StartUp && (attempts
 == KMaxNumberOfPUKAttempts))
 CSecuritySettings::ShowResultNoteL(R_CODE_ERROR,
 CAknNoteDialog::EErrorTone);
 attempts = -1;
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+		iQueryCanceled = EFalse;
 RDEBUG("SecQueryDialog", 1);
-// TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
+// ESecUiCodeEtelReqest/ESecUiNone might be useful
-// TODO also support Emergency
 TBuf<0x100> title;
 title.Zero();
 title.Append(_L("Puk1RequiredL"));
 title.Append(_L("#"));
 title.AppendNum(attempts);
 TInt lSecUiCancelSupported = ESecUiCancelSupported | ESecUiEmergencyNotSupported;
-if(StartUp)		// TODO how to know whether PUK comes from failing at Starter, or failing at any other PIN (i.e. changing PIN, or changing PIN-request) ???
+if(StartUp)		// how to know whether PUK comes from failing at Starter, or failing at any other PIN (i.e. changing PIN, or changing PIN-request) ???
 	lSecUiCancelSupported = ESecUiCancelNotSupported | ESecUiEmergencySupported;
 queryAccepted = iSecQueryUi->SecQueryDialog(title, puk1_password,
 SEC_C_PUK_CODE_MIN_LENGTH, SEC_C_PUK_CODE_MAX_LENGTH,
 ESecUiSecretNotSupported | ESecUiAlphaNotSupported
 | lSecUiCancelSupported | ESecUiPukRequired);
 RDEBUG("puk1_password", 0);
 RDebug::Print(puk1_password);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 if ((queryAccepted == KErrAbort) || (queryAccepted == KErrCancel))
 {
 CAknNoteDialog::EErrorTone);
 returnValue = Puk1RequiredL();
 break;
 case KErrGsm0707SimWrong:
 // sim lock active
-// TODO no message ?
+// no message ?
 break;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 // sim card rejected.
 break;
 {
 // new-pin query
 CSecQueryUi * iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+				iQueryCanceled = EFalse;
 RDEBUG("SecQueryDialog", 1);
-// TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
-// TODO also support Emergency
 queryAccepted = iSecQueryUi->SecQueryDialog(
 _L("PIN1-New|PIN1-Verif"), aNewPinPassword,
 SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH,
 ESecUiAlphaNotSupported | ESecUiCancelSupported
 | ESecUiPukRequired);
 RDEBUG("aNewPinPassword", 0);
 RDebug::Print(aNewPinPassword);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 }
 if ((queryAccepted == KErrAbort) || (queryAccepted == KErrCancel))
 CAknNoteDialog::EErrorTone);
 returnValue = Puk1RequiredL();
 break;
 case KErrGsm0707SimWrong:
 // sim lock active
-// TODO no message ?
+// no message ?
 break;
 case KErrGsmSSPasswordAttemptsViolation:
 case KErrLocked:
 // sim card rejected.
 break;
 RDEBUG("WaitForRequestL ret", ret);
 User::LeaveIfError(ret);
 RDEBUG("codeInfo.iRemainingEntryAttempts",
 codeInfo.iRemainingEntryAttempts);
-if (codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts) // TODO this might be 10 ?
+if (codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts)
 codeInfo.iRemainingEntryAttempts = -1;
 /* request PIN using QT */
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+		iQueryCanceled = EFalse;
 RDEBUG("SecQueryDialog", 1);
-// TODO ESecUiCodeEtelReqest/ESecUiNone might be useful against KLastRemainingInputAttempt
+// ESecUiCodeEtelReqest/ESecUiNone might be useful against KLastRemainingInputAttempt
-// TODO also support Emergency
 TBuf<0x100> title;
 title.Zero();
 title.Append(_L("Pin2RequiredL"));
 title.Append(_L("#"));
 ESecUiSecretNotSupported | ESecUiAlphaNotSupported
 | ESecUiCancelSupported | secCodeType);
 RDEBUG("iSecUi_password", 0);
 RDebug::Print(iSecUi_password);
 RDEBUG("queryAccepted", queryAccepted);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 // If failed or device became locked, any pending request should be cancelled.
 if (queryAccepted != KErrNone)
 {
 /* request PIN using QT */
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+		iQueryCanceled = EFalse;
 RDEBUG("SecQueryDialog", 1);
-// TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
+// ESecUiCodeEtelReqest/ESecUiNone might be useful
-// TODO also support Emergency
 RDEBUG("codeInfo.iRemainingEntryAttempts",
 codeInfo.iRemainingEntryAttempts);
 if (codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts) // TODO this might be 10 ?
 codeInfo.iRemainingEntryAttempts = -1;
 SEC_C_PUK2_CODE_MIN_LENGTH, SEC_C_PUK2_CODE_MAX_LENGTH,
 ESecUiSecretNotSupported | ESecUiAlphaNotSupported
 | ESecUiCancelSupported | secCodeType );
 RDEBUG("iSecUi_password", 0);
 RDebug::Print(iSecUi_password);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 if (queryAccepted != KErrNone)
 {
 	  {
 // new pin2 code query
 CSecQueryUi * iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
-// TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
+				iQueryCanceled = EFalse;
-// TODO also support Emergency
+// ESecUiCodeEtelReqest/ESecUiNone might be useful
 queryAccepted
 = iSecQueryUi->SecQueryDialog(_L("PIN2-New|PIN2-Verif"),
 aNewPassword, SEC_C_PIN2_CODE_MIN_LENGTH,
 SEC_C_PIN2_CODE_MAX_LENGTH, ESecUiAlphaNotSupported
 | ESecUiCancelSupported | secCodeType);
 RDEBUG("aNewPassword", 0);
 RDebug::Print(aNewPassword);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 if (queryAccepted != KErrNone)
 {
 // cancel "get security unblock code" request
 RDEBUG("AbortSecurityCode", 1);
 CleanupStack::PopAndDestroy(1); //wait
 return;
 }
 }
-// send code
+// send code. The code was temporarilly changed before. Thus, this really done to set the new-new one
-// TODO the current code should be verified before
 RDEBUG("VerifySecurityCode", 0);
 iPhone.VerifySecurityCode(wait->iStatus, secCodeType, aNewPassword,
 iSecUi_password);
 RDEBUG("WaitForRequestL", 0);
 res = wait->WaitForRequestL();
 /* request PIN using QT */
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
-// TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
+				iQueryCanceled = EFalse;
+// ESecUiCodeEtelReqest/ESecUiNone might be useful
 // TODO also support Emergency
 if (StartUp || (secUiOriginatedQuery != ESecurityUIsSecUIOriginated)
 || (err != KErrNone))
 lCancelSupported = ESecUiCancelNotSupported;
 else
 SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH,
 ESecUiSecretSupported | ESecUiAlphaNotSupported
 | lCancelSupported | ESecUiCodeEtelReqest);
 RDEBUG("iSecUi_password", 0);
 RDebug::Print(iSecUi_password);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 if (queryAccepted != KErrNone)
 {
 CleanupStack::PopAndDestroy(wait);
 /* request PIN using QT */
 {
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+						iQueryCanceled = EFalse;
 // TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
 // TODO also support Emergency
 TBuf<0x100> title;
 title.Zero();
 iSecUi_password, SEC_C_PUK_CODE_MIN_LENGTH,
 SEC_C_PUK_CODE_MAX_LENGTH, ESecUiAlphaNotSupported
 | ESecUiCancelSupported | ESecUiPukRequired);
 RDEBUG("iSecUi_password", 0);
 RDebug::Print(iSecUi_password);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 if (queryAccepted != KErrNone)
 {
 {
 /* request PIN using QT */
 CSecQueryUi *iSecQueryUi;
 RDEBUG("CSecQueryUi", 0);
 iSecQueryUi = CSecQueryUi::NewL();
+						iQueryCanceled = EFalse;
 // TODO ESecUiCodeEtelReqest/ESecUiNone might be useful
 // TODO also support Emergency
 queryAccepted = iSecQueryUi->SecQueryDialog(_L(
 "UPuk-New|UPuk-Verif"), aNewPassword,
 SEC_C_PUK_CODE_MIN_LENGTH, SEC_C_PUK_CODE_MAX_LENGTH,
 ESecUiAlphaNotSupported | ESecUiCancelSupported
 | ESecUiPukRequired);
 RDEBUG("aNewPassword", 0);
 RDebug::Print(aNewPassword);
+iQueryCanceled = ETrue;
 delete iSecQueryUi;
 RDEBUG("queryAccepted", queryAccepted);
 if (queryAccepted != KErrNone)
 {
 CleanupStack::PopAndDestroy(wait);

changeset 38	e0432375ea67
parent 37	7bad16cccaca
child 45	5d3e34b7618a