diff -r e5618cc85d74 -r 6c158198356e javaextensions/satsa/pki/src.s60/cstscredentialmanager.cpp --- a/javaextensions/satsa/pki/src.s60/cstscredentialmanager.cpp Thu Jul 15 18:31:06 2010 +0300 +++ b/javaextensions/satsa/pki/src.s60/cstscredentialmanager.cpp Thu Aug 19 09:48:13 2010 +0300 @@ -36,7 +36,6 @@ #include - // CONSTANTS _LIT(KSTSSymbianKeyStoreLabel, "Software key store"); _LIT(KSTSSymbianCertificateStoreLabel, "Software certificate store"); @@ -67,10 +66,7 @@ { delete iEncodedCert; delete iIssuerAndSerialNumber; - if (iPKIDialog) - { - iPKIDialog->Release(); - } + delete iDistinguishedName; delete iDisplayName; delete iRequestEncoded; @@ -533,8 +529,7 @@ // void CSTSCredentialManager::ConstructL() { - iPKIDialog = PKIDialogFactory::CreateNoteL(); - + User::LeaveIfError(iFileServer.Connect()); iWait = new(ELeave) CActiveSchedulerWait; iStore = CUnifiedCertStore::NewL(iFileServer, ETrue); @@ -619,8 +614,7 @@ { // not found, ok to add iState = EAddDialog; - iPKIDialog->SaveCertificate(EX509Certificate, EUserCertificate, - iSubject, iStatus); + SetActive(); return; } @@ -720,7 +714,8 @@ CCTCertInfo* certInfo = (*iCertInfoArray)[ 0 ]; iState = ERemoveDialog; iHandle = certInfo->Handle(); - iPKIDialog->DeleteCertificate(iHandle, iStatus); + + SetActive(); } @@ -783,7 +778,7 @@ iState = ECSRDialog; iHandle = iKeyInfo->Handle(); - iPKIDialog->CreateCSR(*iDisplayName, iHandle, iStatus); + SetActive(); }