--- a/javaextensions/satsa/pki/src.s60/cstscredentialmanager.cpp Tue Aug 31 15:09:22 2010 +0300
+++ b/javaextensions/satsa/pki/src.s60/cstscredentialmanager.cpp Wed Sep 01 12:33:18 2010 +0100
@@ -32,15 +32,10 @@
#include <charconv.h>
#include <pkcs10.h>
#include <secdlg.h>
-
-#ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
#include <PKIDlg.h>
-#endif
-
#include <securityerr.h>
-
// CONSTANTS
_LIT(KSTSSymbianKeyStoreLabel, "Software key store");
_LIT(KSTSSymbianCertificateStoreLabel, "Software certificate store");
@@ -71,12 +66,7 @@
{
delete iEncodedCert;
delete iIssuerAndSerialNumber;
-#ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
- if (iPKIDialog)
- {
- iPKIDialog->Release();
- }
-#endif
+
delete iDistinguishedName;
delete iDisplayName;
delete iRequestEncoded;
@@ -539,9 +529,7 @@
//
void CSTSCredentialManager::ConstructL()
{
- #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
- iPKIDialog = PKIDialogFactory::CreateNoteL();
- #endif
+
User::LeaveIfError(iFileServer.Connect());
iWait = new(ELeave) CActiveSchedulerWait;
iStore = CUnifiedCertStore::NewL(iFileServer, ETrue);
@@ -626,10 +614,7 @@
{
// not found, ok to add
iState = EAddDialog;
- #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
- iPKIDialog->SaveCertificate(EX509Certificate, EUserCertificate,
- iSubject, iStatus);
- #endif
+
SetActive();
return;
}
@@ -729,9 +714,8 @@
CCTCertInfo* certInfo = (*iCertInfoArray)[ 0 ];
iState = ERemoveDialog;
iHandle = certInfo->Handle();
- #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
- iPKIDialog->DeleteCertificate(iHandle, iStatus);
- #endif
+
+
SetActive();
}
@@ -793,9 +777,8 @@
}
iState = ECSRDialog;
iHandle = iKeyInfo->Handle();
- #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
- iPKIDialog->CreateCSR(*iDisplayName, iHandle, iStatus);
- #endif
+
+
SetActive();
}
@@ -1039,3 +1022,5 @@
FunctionServer::doServerSideInit();
}
+
+