diff -r e5b3a2155e1a -r d2c4c66342f3 messagingfw/msgcommonutils/src/javaprotectionresolver.cpp --- a/messagingfw/msgcommonutils/src/javaprotectionresolver.cpp Thu Aug 19 10:24:00 2010 +0300 +++ b/messagingfw/msgcommonutils/src/javaprotectionresolver.cpp Tue Aug 31 15:41:11 2010 +0300 @@ -27,7 +27,9 @@ #include // TDataType #include // RFs, RFile, CFileMan -#include "javaprotectionresolver.h" +#include + +#include "JavaProtectionResolver.h" // EXTERNAL DATA STRUCTURES @@ -39,6 +41,14 @@ // LOCAL CONSTANTS AND MACROS +#if defined (__WINS__) +//_LIT( KFileProtTempDir, "c:\\system\\temp\\fileprot_temp\\"); +_LIT( KFileProtTempDir, "\x43:\\system\\temp\\fileprot_temp\\"); +#else +//_LIT( KFileProtTempDir, "d:\\system\\temp\\fileprot_temp\\"); +_LIT( KFileProtTempDir, "\x44:\\system\\temp\\fileprot_temp\\"); +#endif + // MODULE DATA STRUCTURES // LOCAL FUNCTION PROTOTYPES @@ -82,32 +92,27 @@ // ----------------------------------------------------------------------------- // TBool CJavaProtectionResolver::IsSuperDistributionPackageL( RFile& aFile ) - { - /** - * JavaSuperDParser has been removed from 9.2 TB, - * So we will always return EFalse and whole code of function is commented out. - */ -// TBool retVal( EFalse ); -// -// CFileMan* fileMan = CFileMan::NewL( iFs ); -// iFs.MkDir( KFileProtTempDir ); -// -// Java::CJavaSuperDParser* javaParser( NULL ); -// TRAPD( err, javaParser = Java::CJavaSuperDParser::NewL( iFs, -// aFile, -// KFileProtTempDir ) ); -// if ( !err ) -// { -// retVal = ETrue; -// } -// delete javaParser; -// -// /*TInt err =*/ fileMan->Delete( KFileProtTempDir /*, CFileMan::ERecurse*/ ); -// /*TInt err =*/ fileMan->RmDir( KFileProtTempDir ); -// delete fileMan; + { + TBool retVal( EFalse ); + + CFileMan* fileMan = CFileMan::NewL( iFs ); + iFs.MkDir( KFileProtTempDir ); -// return retVal; - return EFalse; + Java::CJavaSuperDParser* javaParser( NULL ); + TRAPD( err, javaParser = Java::CJavaSuperDParser::NewL( iFs, + aFile, + KFileProtTempDir ) ); + if ( !err ) + { + retVal = ETrue; + } + delete javaParser; + + /*TInt err =*/ fileMan->Delete( KFileProtTempDir /*, CFileMan::ERecurse*/ ); + /*TInt err =*/ fileMan->RmDir( KFileProtTempDir ); + delete fileMan; + + return retVal; } // End of File