diff -r e5618cc85d74 -r 6c158198356e javaextensions/satsa/pki/src.s60/cstsseprompt.cpp --- a/javaextensions/satsa/pki/src.s60/cstsseprompt.cpp Thu Jul 15 18:31:06 2010 +0300 +++ b/javaextensions/satsa/pki/src.s60/cstsseprompt.cpp Thu Aug 19 09:48:13 2010 +0300 @@ -18,11 +18,24 @@ // INCLUDE FILES + + + #include "cstsseprompt.h" + +#ifdef RD_JAVA_S60_RELEASE_10_1_ONWARDS + +#include +#include +const QString KMessageTextKey = "text"; + +#else + #include #include #include +#endif // ============================ MEMBER FUNCTIONS =============================== @@ -43,8 +56,10 @@ // Destructor CSTSSEPrompt::~CSTSSEPrompt() { +#ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS delete iGlobalNote; delete iSynchronizer; +#endif } // ----------------------------------------------------------------------------- @@ -54,11 +69,26 @@ // void CSTSSEPrompt::DisplayPromptL(const TDesC& aPrompt) { + #ifdef RD_JAVA_S60_RELEASE_10_1_ONWARDS + HbDeviceDialog* dialog; + dialog = new(ELeave) HbDeviceDialog(); + + QVariantMap parameters; + QString qString((QChar*)aPrompt.Ptr(),aPrompt.Length()); + parameters[QString(KMessageTextKey)] = qString; + + dialog->show("com.nokia.hb.devicemessagebox/1.0", parameters); + + delete dialog; + #else + iGlobalNote->ShowNoteL( iSynchronizer->iStatus, - EAknGlobalConfirmationNote, + EAknGlobalConfirmationNote, aPrompt); iSynchronizer->ExecuteL((TTimeIntervalMicroSeconds32) 0); + + #endif } // ----------------------------------------------------------------------------- @@ -77,9 +107,11 @@ // ----------------------------------------------------------------------------- void CSTSSEPrompt::ConstructL() { + #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS iGlobalNote = CAknGlobalNote::NewL(); iGlobalNote->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY); iSynchronizer = CAOSynchronizer::NewL(); + #endif }