# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276066885 -10800 # Node ID ace62b58f4b2641efea7c9300f68bc578a8ed3cd # Parent 1b207dd38b723225b2c752ce5e05b633d3e5635c Revision: 201021 Kit: 2010123 diff -r 1b207dd38b72 -r ace62b58f4b2 contentpublishingsrv/contentpublishingserver/cpserver/inc/cpnotificationhandler.h --- a/contentpublishingsrv/contentpublishingserver/cpserver/inc/cpnotificationhandler.h Tue May 25 13:01:39 2010 +0300 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/inc/cpnotificationhandler.h Wed Jun 09 10:01:25 2010 +0300 @@ -170,6 +170,13 @@ TBool CheckRegistryTypeL( const CLiwMap& aMap, const CCPLiwMap& aFilter ); + /** + * Appends KDataMap for notification list if needed + * + * @param aMap Map with notifications + */ + void AppendDataMapL( CLiwDefaultList* aListOfMaps ); + private: // data diff -r 1b207dd38b72 -r ace62b58f4b2 contentpublishingsrv/contentpublishingserver/cpserver/src/cpnotificationhandler.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpnotificationhandler.cpp Tue May 25 13:01:39 2010 +0300 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpnotificationhandler.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -255,6 +255,11 @@ else { //notification cannot be sent in this moment + //append KDataMap if exists + if( iDataMapCache.TypeId() == EVariantTypeDesC8 ) + { + TRAP_IGNORE( AppendDataMapL( aListOfMaps ) ); + } aListOfMaps->IncRef( ); iNotifications.AppendL( aListOfMaps ); } @@ -264,7 +269,6 @@ // // ---------------------------------------------------------------------------- // - const CLiwGenericParamList* CCPNotificationHandler::GetPointerToChangeInfoList() { return iChangeInfoList; @@ -552,3 +556,57 @@ CleanupStack::PopAndDestroy( &type ); return result; } + +// ---------------------------------------------------------------------------- +// +// ---------------------------------------------------------------------------- +// +void CCPNotificationHandler::AppendDataMapL( CLiwDefaultList* aListOfMaps ) + { + CP_DEBUG( _L8("CCPNotificationHandler::SendChangeInfoListL()") ); + //for every observer in session + THashMapIter iter( iFilters ); + const CCPLiwMap*const* filter = iter.NextValue( ); + while( filter ) + { + TInt count = aListOfMaps->Count( ); + //for every item in the input list + for ( TInt j = 0; j < count; j++ ) + { + TLiwVariant variant; + variant.PushL( ); + aListOfMaps->AtL( j, variant ); + if ( variant.TypeId() == EVariantTypeMap ) + { + const CLiwMap* map = variant.AsMap(); + if ( IsProperForFilterL( *map, **filter ) ) + { + if (iExtendedFlags.FindL(*iter.CurrentKey()) + && (iDataMapCache.TypeId() == EVariantTypeDesC8)) + { + //extended notifications - append data map + CLiwDefaultMap* extendedMap = CLiwDefaultMap::NewLC(); + TInt count = map->Count(); + for(TInt i=0; i key; + map->AtL(i,key); + map->FindL(key, temporary); + extendedMap->InsertL(key,temporary); + CleanupStack::PopAndDestroy(&temporary); + } + extendedMap->InsertL( KDataMap,iDataMapCache ); + aListOfMaps->Remove( j ); + aListOfMaps->AppendL( TLiwVariant( extendedMap ) ); + CleanupStack::PopAndDestroy(extendedMap); + } + } + + } + CleanupStack::PopAndDestroy( &variant ); + } + filter = iter.NextValue( ); + } + } diff -r 1b207dd38b72 -r ace62b58f4b2 contentpublishingsrv/contentpublishingserver/cpserver/src/cpserversession.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserversession.cpp Tue May 25 13:01:39 2010 +0300 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserversession.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -339,21 +339,23 @@ const TLiwGenericParam* param = NULL; TInt pos(0); param = genericList->FindFirst(pos, KFilters); - const CLiwList* maps = param->Value().AsList(); - CLiwDefaultList* cpMaps = CheckValidityLC(maps); - //execute actions - for (TInt i = 0; i < cpMaps->Count(); i++) + if( param && pos!= KErrNotFound ) { - TLiwVariant mapVariant; - mapVariant.PushL(); - cpMaps->AtL(i, mapVariant); - const CCPLiwMap* map = - static_cast (mapVariant.AsMap()); - TRAP_IGNORE(ExecuteActionL(map, ETrue, options)); - CleanupStack::PopAndDestroy(&mapVariant); + const CLiwList* maps = param->Value().AsList(); + CLiwDefaultList* cpMaps = CheckValidityLC(maps); + //execute actions + for (TInt i = 0; i < cpMaps->Count(); i++) + { + TLiwVariant mapVariant; + mapVariant.PushL(); + cpMaps->AtL(i, mapVariant); + const CCPLiwMap* map = + static_cast (mapVariant.AsMap()); + TRAP_IGNORE(ExecuteActionL(map, ETrue, options)); + CleanupStack::PopAndDestroy(&mapVariant); + } + CleanupStack::PopAndDestroy(cpMaps); } - - CleanupStack::PopAndDestroy(cpMaps); CleanupStack::PopAndDestroy(genericList); } diff -r 1b207dd38b72 -r ace62b58f4b2 contentpublishingsrv/contentpublishingserver/cpsqlitestorage/src/cpstorageengine.cpp --- a/contentpublishingsrv/contentpublishingserver/cpsqlitestorage/src/cpstorageengine.cpp Tue May 25 13:01:39 2010 +0300 +++ b/contentpublishingsrv/contentpublishingserver/cpsqlitestorage/src/cpstorageengine.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -177,6 +177,8 @@ iDataMapCache.Reset(); map->FindL(KDataMap, iDataMapCache); iCallback->HandleChangeL( listOfMaps ); + //data cache must be cleaned here, otherwise it can mess up other requests. + iDataMapCache.Reset(); CleanupStack::PopAndDestroy( listOfMaps ) ; } else diff -r 1b207dd38b72 -r ace62b58f4b2 group/bld.inf --- a/group/bld.inf Tue May 25 13:01:39 2010 +0300 +++ b/group/bld.inf Wed Jun 09 10:01:25 2010 +0300 @@ -15,10 +15,6 @@ * */ -#include - -PRJ_EXPORTS -../inc/aisystemuids.hrh MW_LAYER_PLATFORM_EXPORT_PATH(aisystemuids.hrh) #include "../xcfw/group/bld.inf" #include "../homescreenpluginsrv/group/bld.inf" diff -r 1b207dd38b72 -r ace62b58f4b2 group/robot_patch.zip Binary file group/robot_patch.zip has changed diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/client/hspsclientsession.cpp --- a/homescreenpluginsrv/hspsmanager/client/hspsclientsession.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/client/hspsclientsession.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -24,6 +24,9 @@ #include "hspsthemeserver.h" #include "hspsclientsession.h" +const TInt KRetryMax = 256; +const TInt KRetryInterval = 100000; // 100ms + // Standard server startup code static TInt StartServer() { @@ -72,28 +75,37 @@ // ----------------------------------------------------------------------------- // EXPORT_C TInt RhspsClientSession::Connect() - { - TVersion ver = TVersion(KhspsThemeServerMajorVersionNumber,KhspsThemeServerMinorVersionNumber, - KhspsThemeServerBuildVersionNumber); - TInt retry=2; - for (;;) + { + TVersion ver = TVersion( KhspsThemeServerMajorVersionNumber, + KhspsThemeServerMinorVersionNumber, + KhspsThemeServerBuildVersionNumber); + + TInt retry = KRetryMax; + + for(;;) { - TInt r=CreateSession(KhspsThemeServerName, ver, KDefaultMessageSlots); + TInt r = CreateSession( KhspsThemeServerName, ver, KDefaultMessageSlots ); - if (r!=KErrNotFound && r!=KErrServerTerminated) + if( r != KErrNotFound && r != KErrServerTerminated ) { return r; - } - - if (--retry==0) + } + + retry--; + if( retry == 0 ) { return r; - } + } - r=StartServer(); - if (r!=KErrNone && r!=KErrAlreadyExists) + r = StartServer(); + if( r != KErrNone && r != KErrAlreadyExists ) { return r; + } + + if( r == KErrAlreadyExists ) + { + User::After( KRetryInterval ); } } } diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/inc/hspsinstallationhandler.h --- a/homescreenpluginsrv/hspsmanager/inc/hspsinstallationhandler.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/inc/hspsinstallationhandler.h Wed Jun 09 10:01:25 2010 +0300 @@ -577,19 +577,23 @@ /** * Finds locale specific subdirectories and resources and appends those * into the resource array + * * @since S60 5.0 - * @param aPath is a directory where the locale specific subdirectories exits + * @param aPath is a directory where the locale specific subdirectories exits + * @param aProcessOnlyDTD If ETrue, then only DTD files are processed. */ void AddLocalesL( - const TDesC& aPath ); + const TDesC& aPath, + const TBool aProcessOnlyDTD ); /** - * Adds localized resources from the provided subdirectory + * Adds localized dtd resources from the provided subdirectory + * * @since S60 5.0 - * @param aLanguage is name of the subdirectory - * @param aPath is path to the subdirectory where the locale specific resources can be found + * @param aPath Path to the subdirectory where the locale specific resources can be found + * @param aLanguage Name of the subdirectory */ - void AddLocalizedResourcesL( + void AddDtdFileL( const TDesC& aPath, const TLanguage aLanguage ); @@ -599,17 +603,7 @@ * @return path to a Xuikon etc folder or an empty string */ TFileName GetInterfacePath(); - - /** - * Add DTD files from the HSPS folder. - */ - void AddHspsLocalesV2L( - const TDesC& aPath ); - - void AddLocalizedResourcesDTDV2L( - const TDesC& aPath, - const TLanguage aLanguage ); - + /** * Finds all language specific folders and resources * under the interface path in ROM or UDA drive. diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/inc/hspsserverutil.h --- a/homescreenpluginsrv/hspsmanager/inc/hspsserverutil.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/inc/hspsserverutil.h Wed Jun 09 10:01:25 2010 +0300 @@ -138,8 +138,42 @@ static TPtrC8 FindConfigurationAttrL( const ChspsODT& aOdt, const TDesC8& aAttr ); + + /** + * Removes plug-in resources from the client app. + * @since S60 5.2 + * @param aFilemanager File manager instance + * @param aAppUid UID of the application configuration + * @param aPluginODT Plugin configuration + */ + static void RemoveResourceFilesL( + CFileMan& aFilemanager, + RFs& aFs, + const TInt aAppUid, + const ChspsODT& aPluginODT ); /** + * Finds language specific resources from a plug-in and handles copying + * of the resources to a destination folder. + * @since S60 5.0 + * @param aAppODT Application configuration + * @param aFs Reference to OPEN file server session handle. + * @param aFilemanager File manager instance + * @param aDeviceLanguage Device language + * @param aConfUid Idenifies the plug-in which is to be processed + * @param aDestination Target path where the files should be copied to + * @param aIsRelevant Set if the source file should be copied without the checks + */ + static TInt CopyResourceFilesL( + ChspsODT& aAppODT, + RFs& aFs, + CFileMan& aFilemanager, + const TInt aDeviceLanguage, + const TInt aConfUid, + const TDesC& aDestination, + const TBool aIsRelevant = EFalse ); + + /** * Copies a file to a target path when neccessary. * Target path is created if it's missing. * File is copied if the target's size or date are different or @@ -149,13 +183,15 @@ * @param aFilemanager Referemce to file manager instance * @param aTargetPath Path where the file should be copied to * @param aFilename Path and name of the file to be copied + * @param aIsRelevant Set if the source file should be copied without the checks * @return error code */ static TInt CopyResourceFileL( RFs& aFs, CFileMan& aFilemanager, const TPath& aTargetPath, - const TFileName& aSourceFile ); + const TFileName& aSourceFile, + const TBool aIsRelevant = EFalse ); /** * Checks: @@ -473,7 +509,8 @@ TFileName& aFilename ); /** - * Resolve resource files that need to be copied. + * Resolve resource files that need to be copied, + * plug-in may not have requested localization. * * @since S60 5.1 * @@ -484,7 +521,7 @@ * of resources if any applicable. * Ownership of given resources is not transferred! */ - static void GetValidResourcesL( + static void GetResourcesForLanguageL( ChspsODT& aODT, const TInt aConfUid, const TLanguage aActiveLanguage, diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/inc/hspsthemeserver.h --- a/homescreenpluginsrv/hspsmanager/inc/hspsthemeserver.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/inc/hspsthemeserver.h Wed Jun 09 10:01:25 2010 +0300 @@ -534,6 +534,16 @@ TInt& aPos ); /** + * Erases resource files from plug-in specific subdirectories under + * the client's private path. + * Plug-ins that belong to an active application configuration will + * be processed. + * @since S60 5.2 + * @param aAppODT is an application configuration to be checked + */ + void ResetResourcesL( ChspsODT& aAppODT ); + + /** * Localizes an ODT. * Testing: change first two digits from \epoc32\RELEASE\WINSCW\udeb\ * Z\resource\BootData\Languages.txt file and reboot the emulator. @@ -1028,6 +1038,7 @@ TBool iHeaderListPending; RFs iFsSession; + CFileMan* iFileMan; ChspsDefinitionRepository* iDefinitionRepository; CRepository* iCentralRepository; ChspsSecurityEnforcer* iSecurityEnforcer; diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/inc/hspsthemeserversession.h --- a/homescreenpluginsrv/hspsmanager/inc/hspsthemeserversession.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/inc/hspsthemeserversession.h Wed Jun 09 10:01:25 2010 +0300 @@ -315,21 +315,7 @@ void FindWidgetUidsL( ChspsODT& aAppODT, RArray& aUidArray ); - - /** - * Handles copying of widget resources to a destination folder. - * @since S60 5.0.1 - * @param aAppODT Application configuration - * @param aFilemanager File manager - * @param aConfUid Widget which is to be processed - * @param aDestination Target path where the files should be copied to - */ - TInt DoCopyResourceFilesL( - ChspsODT& aAppODT, - CFileMan& aFilemanager, - const TInt aConfUid, - const TDesC& aDestination ); - + private: RFs iFs; ChspsInstallationHandler* iInstallationHandler; diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/src/hspsinstallationhandler.cpp --- a/homescreenpluginsrv/hspsmanager/src/hspsinstallationhandler.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/src/hspsinstallationhandler.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -520,28 +520,28 @@ // void ChspsInstallationHandler::FinalizeParsingL() { - // Check resources + // Add resources TFileName interfacePath( GetInterfacePath() ); if ( interfacePath.Length() ) - { - // If name of the DTD file was specified in the manifest - if ( iDtdFile ) - { - TParse pathParser; - pathParser.Set( iThemeFilePath, NULL, NULL ); - pathParser.PopDir(); // pop locale specific folder - - // Find locale specific DTD file - AddHspsLocalesV2L( pathParser.FullName() ); - } - - // Find Xuikon resources of each locale - AddInterfaceResourcesV2L( interfacePath ); + { + // If name of the DTD file was specified in the manifest + if ( iDtdFile ) + { + TParse pathParser; + pathParser.Set( iThemeFilePath, NULL, NULL ); + pathParser.PopDir(); // pop locale specific folder + + // Find locale specific DTD file + AddLocalesL( pathParser.FullName(), ETrue ); + } + + // Find Xuikon resources of each locale + AddInterfaceResourcesV2L( interfacePath ); } else { // Find DTD files and locale specific resources from subdirectories under the installation path - AddLocalesL( iThemeFilePath ); + AddLocalesL( iThemeFilePath, EFalse ); } // Validate other input from the manifest @@ -2198,126 +2198,6 @@ } // ----------------------------------------------------------------------------- -// Finds locale specific subdirectories and DTD resources and appends those -// into the resource array -// Should be executed prior to the CheckHeader method! -// ----------------------------------------------------------------------------- -// -void ChspsInstallationHandler::AddHspsLocalesV2L( - const TDesC& aPath ) - { - // Find all locale specific subfolders - TFindFile fileFinder( iFsSession ); - _LIT( KFilter, "*" ); - CDir* fileList( NULL ); - fileFinder.FindWildByDir( KFilter, aPath, fileList ); - if ( fileList ) - { - CleanupStack::PushL( fileList ); - TFileName localePath; - for( TInt i = 0; i < fileList->Count(); i++ ) - { - const TEntry& entry = (*fileList)[i]; - if ( entry.IsDir() ) - { - TInt languageIndex = 0; - TLex lex( entry.iName ); - TInt error = lex.Val( languageIndex ); - - // See enumarations from e32lang.h - if( !error && languageIndex >= ELangTest ) - { - - // Process only supported languages - CArrayFixFlat* languageCodes = NULL; - hspsServerUtil::GetInstalledLanguagesL( languageCodes ); - CleanupStack::PushL( languageCodes ); - TBool isSupported = EFalse; - for( TInt i=0; iCount(); i++ ) - { - if( languageCodes->At( i ) == languageIndex ) - { - isSupported = ETrue; - break; - } - } - CleanupStack::PopAndDestroy( languageCodes ); - if( !isSupported ) - { - continue; - } - - // If we found the first language specification - if ( !iDefaultSpecificationSet ) - { - // Assume this is the default language shown incase - // there is no locale for the active UI language - iDefaultSpecification = (TLanguage)languageIndex; - iDefaultSpecificationSet = ETrue; - } - - // Setup a path to the subdirectory - localePath.Copy( aPath ); - localePath.Append( entry.iName ); - localePath.Append( KPathDelim ); - - // Find localized resources - AddLocalizedResourcesDTDV2L( - localePath, - (TLanguage)languageIndex ); - } - } - - } - CleanupStack::PopAndDestroy( fileList ); - fileList = NULL; - } - } - -// ----------------------------------------------------------------------------- -// Adds localized resources from the provided subdirectory -// ----------------------------------------------------------------------------- -// -void ChspsInstallationHandler::AddLocalizedResourcesDTDV2L( - const TDesC& aPath, - const TLanguage aLanguage ) - { - // Append path with the default name of DTD files - const TInt len = aPath.Length() + iDtdFile->Des().Length(); - HBufC* dtdPath = HBufC::NewLC( len ); - dtdPath->Des().Copy( aPath ); - dtdPath->Des().Append( *iDtdFile ); - - // Check whether the file exists - if( !BaflUtils::FileExists( iFsSession, *dtdPath ) ) - { -#ifdef HSPS_LOG_ACTIVE - if( iLogBus ) - { - iLogBus->LogText( _L( "ChspsInstallationHandler::AddLocalizedResourcesDTDV2L(): - DTD file was not found '%S'" ), - &dtdPath ); - } -#endif - iFileNotFound = ETrue; - iResult->iXuikonError = KErrDtdFileNotFound; - User::Leave( KErrNotFound ); - } - - // Store locale specific DTD files into the resource array - TPtrC8 mediaType; - TPtrC8 tags; - AddResourceL( - *iResourceList, - *dtdPath, - aLanguage, - EResourceDTD, - mediaType, - tags ); - - CleanupStack::PopAndDestroy( dtdPath ); - } - -// ----------------------------------------------------------------------------- // ChspsInstallationHandler::AddInterfaceResourcesV2L // ----------------------------------------------------------------------------- // @@ -2353,7 +2233,8 @@ // ----------------------------------------------------------------------------- // void ChspsInstallationHandler::AddLocalesL( - const TDesC& aPath ) + const TDesC& aPath, + const TBool aProcessOnlyDTD ) { // Retrieve phone supported language. CArrayFixFlat* languageCodes = NULL; @@ -2361,19 +2242,32 @@ CleanupStack::PushL( languageCodes ); // Ensure that path contains '\' at the end. - TFileName xuikonPath; - xuikonPath.Copy( aPath ); - if( xuikonPath.Length() > KPathDelim().Length() ) + TFileName pathBase; + pathBase.Copy( aPath ); + if( pathBase.Length() > KPathDelim().Length() ) { - if( xuikonPath.Mid( xuikonPath.Length() - - KPathDelim().Length() - ).Compare( KPathDelim ) != 0 ) + if( pathBase.Mid( pathBase.Length() - + KPathDelim().Length() + ).Compare( KPathDelim ) != 0 ) { - xuikonPath.Append( KPathDelim ); + pathBase.Append( KPathDelim ); } } - _LIT( KFormatting, "%02d" ); + TParsePtrC driveParser( pathBase ); + TInt driveEnum = KErrNotFound; + + if( !aProcessOnlyDTD ) + { + if( driveParser.DrivePresent() && driveParser.Drive().Length() > 0 ) + { + User::LeaveIfError( + RFs::CharToDrive( ( driveParser.Drive() )[0], + driveEnum ) ); + } + } + + _LIT( KFormatNN, "%02d" ); TFileName localePath; for( TInt i = 0; i < languageCodes->Count(); i++ ) @@ -2383,8 +2277,15 @@ // Construct locale path using two digit minium // width and zero as padding. - localePath.Copy( xuikonPath ); - localePath.AppendFormat( KFormatting, languageCode ); + localePath.Copy( pathBase ); + if( languageCode < 10 ) + { + localePath.AppendFormat( KFormatNN, languageCode ); + } + else + { + localePath.AppendNum( languageCode ); + } localePath.Append( KPathDelim ); // Check if folder for supported language exists. @@ -2395,10 +2296,10 @@ exists = ETrue; } - // Support also one digit type folder naming. + // Support also one digit type folder naming possibly used by the imports. if( !exists && languageCode < 10 ) { - localePath.Copy( xuikonPath ); + localePath.Copy( pathBase ); localePath.AppendNum( languageCode ); localePath.Append( KPathDelim ); @@ -2418,12 +2319,24 @@ iDefaultSpecification = (TLanguage)languageCode; iDefaultSpecificationSet = ETrue; } - - - // Find and add localized resources - AddLocalizedResourcesL( - localePath, - (TLanguage)languageCode ); + + // Add dtd file if existing. + AddDtdFileL( localePath, (TLanguage)languageCode ); + + if( !aProcessOnlyDTD ) + { + // Find localized files from the provided directory + RArray driveArray; + CleanupClosePushL( driveArray ); + driveArray.Append( driveEnum ); + + FindResourceFilesL( localePath, + EFalse, + driveArray, + NULL ); + + CleanupStack::PopAndDestroy(); // driveArray + } } } @@ -2432,13 +2345,13 @@ } // ----------------------------------------------------------------------------- -// Adds localized resources from the provided subdirectory +// Adds localized dtd resources from the provided subdirectory // ----------------------------------------------------------------------------- // -void ChspsInstallationHandler::AddLocalizedResourcesL( +void ChspsInstallationHandler::AddDtdFileL( const TDesC& aPath, const TLanguage aLanguage ) - { + { // If FileDTD was declared if ( iDtdFile && iDtdFile->Des().Length() ) { @@ -2475,17 +2388,7 @@ tagsPtr ); CleanupStack::PopAndDestroy( dtdPath ); - } - - // Find localized files from the provided directory - RArray driveArray; - CleanupClosePushL( driveArray ); - driveArray.Append( EDriveE ); - driveArray.Append( EDriveC ); - - FindResourceFilesL( aPath, EFalse, driveArray, NULL ); - - CleanupStack::PopAndDestroy(); // driveArray + } } // ----------------------------------------------------------------------------- diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/src/hspsserverutil.cpp --- a/homescreenpluginsrv/hspsmanager/src/hspsserverutil.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/src/hspsserverutil.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -37,6 +37,7 @@ _LIT( KThemesFolder, "\\themes\\" ); _LIT( KDoubleBackSlash, "\\" ); _LIT8( KHexPrefix8, "0x" ); +_LIT( KClientSources, "c:\\private\\%x\\%D\\%D\\%D\\%S\\sources\\%S" ); // ----------------------------------------------------------------------------- // hspsServerUtil::GenerateConfigurationAttributesL @@ -558,6 +559,110 @@ } // ----------------------------------------------------------------------------- +// hspsServerUtil::RemoveResourceFilesL +// ----------------------------------------------------------------------------- +void hspsServerUtil::RemoveResourceFilesL( + CFileMan& aFilemanager, + RFs& aFs, + const TInt aAppUid, + const ChspsODT& aPluginODT ) + { + // Remove all plug-in resources + for( TInt i=0; i< aPluginODT.ResourceCount(); i++ ) + { + ChspsResource& r = aPluginODT.ResourceL( i ); + if( r.FileName().Find( KSourcesFolder ) > 0 ) + { + TPtrC id( GetFixedOdtName( r.ResourceId() ) ); + const TDesC& ver( aPluginODT.ThemeVersion() ); + TFileName resource; + resource.Format( + KClientSources, + aAppUid, + aPluginODT.RootUid(), + aPluginODT.ProviderUid(), + aPluginODT.ThemeUid(), + &ver, + &id ); + if( BaflUtils::FileExists( aFs, resource ) ) + { + aFilemanager.Delete( resource, 0 ); + } + } + } + } + + +// ----------------------------------------------------------------------------- +// hspsServerUtil::CopyResourceFilesL +// ----------------------------------------------------------------------------- +TInt hspsServerUtil::CopyResourceFilesL( + ChspsODT& aAppODT, + RFs& aFs, + CFileMan& aFilemanager, + const TInt aDeviceLanguage, + const TInt aConfUid, + const TDesC& aDestination, + const TBool aIsRelevant ) + { + TInt error( KErrNone ); + RPointerArray widgetResources; // Objects are not owned. + CleanupClosePushL( widgetResources ); + + // Find resources for the language or common to all languages or test resources + // if others couldn't be found + GetResourcesForLanguageL( + aAppODT, + aConfUid, + (TLanguage)aDeviceLanguage, + widgetResources ); + + // Copy the resources found + for( TInt i = 0; ( i < widgetResources.Count() && !error ); i++ ) + { + ChspsResource* resource = widgetResources[i]; + if( !resource ) + { + continue; + } + + // Get relative path under the themes folder + TPath relativePath; + GetRelativeResourcePath( + resource->FileName(), + relativePath ); + + // Strip language indicator from the relative path + GetLocaleIndependentResourcePath( + resource->Language(), + relativePath ); + + // Finalize target path + TPath targetPath; + targetPath.Copy( aDestination ); + targetPath.Append( relativePath ); + + // Create target path and copy files when required + error = CopyResourceFileL( + aFs, + aFilemanager, + targetPath, + resource->FileName(), + aIsRelevant ); + if ( error == KErrAlreadyExists ) + { + error = KErrNone; + } + + } // copy loop + + widgetResources.Reset(); + CleanupStack::PopAndDestroy( 1, &widgetResources ); + + return error; + } + +// ----------------------------------------------------------------------------- // hspsServerUtil::CopyResourceFileL // ----------------------------------------------------------------------------- // @@ -565,7 +670,8 @@ RFs& aFs, CFileMan& aFilemanager, const TPath& aTargetPath, - const TFileName& aSourceFile ) + const TFileName& aSourceFile, + const TBool aIsRelevant ) { // Construct target file with full path. TFileName targetFile; @@ -587,10 +693,11 @@ TInt error = KErrNone; - if ( hspsServerUtil::ResourceCopyIsRelevantL( - aSourceFile, - targetFile, - aFs ) + if ( aIsRelevant + || hspsServerUtil::ResourceCopyIsRelevantL( + aSourceFile, + targetFile, + aFs ) ) { // Make target folder @@ -616,7 +723,17 @@ aTargetPath, 0, KEntryAttReadOnly, - TTime( 0 ) ); // TTime(0) = preserve original time stamp. + TTime( 0 ) ); // TTime(0) = preserve original time stamp. + +#ifdef HSPS_LOG_ACTIVE + if ( iLogBus ) + { + iLogBus->LogText( + _L( "hspsServerUtil::CopyResourceFileL(): - %S was copied" ), + &aTargetPath + ); + } +#endif } } @@ -1702,9 +1819,9 @@ } // ----------------------------------------------------------------------------- -// hspsServerUtil::GetValidResourcesL +// hspsServerUtil::GetResourcesForLanguageL // ----------------------------------------------------------------------------- -void hspsServerUtil::GetValidResourcesL( +void hspsServerUtil::GetResourcesForLanguageL( ChspsODT& aODT, const TInt aConfUid, const TLanguage aActiveLanguage, @@ -1780,7 +1897,8 @@ RPointerArray widgetResources; // Objects are not owned. CleanupClosePushL( widgetResources ); - GetValidResourcesL( aODT, + GetResourcesForLanguageL( + aODT, aODT.ThemeUid(), aActiveLanguage, widgetResources ); @@ -2049,6 +2167,9 @@ } // driveIndex } +// ----------------------------------------------------------------------------- +// hspsServerUtil::GetInstalledLanguagesL +// ----------------------------------------------------------------------------- void hspsServerUtil::GetInstalledLanguagesL( CArrayFixFlat*& aLanguages ) { diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp --- a/homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -75,6 +75,8 @@ // prevent ROM installation on every boot up _LIT( KDummyVersionInfo, "dummyversioninfo" ); +_LIT( KProcessFindString, "hspsthemeserver*" ); + const TUint KAppId_hspsAS = 270486738; // 0x101F4CD2 from S60 3.1 Xuikon AppShell in 3.1 product. const TUint KAppId_hspsAI = 271012080 ; // 0x102750F0 support for Xuikon-based ActiveIdle const TUint KAppId_LE = 270551469 ; // 0x102049AD LayoutTest @@ -177,7 +179,20 @@ // ----------------------------------------------------------------------------- // TInt E32Main() - { + { + TFindProcess processFinder( KProcessFindString ); + TFullName fullName; + TInt count = 0; + while( processFinder.Next( fullName ) == KErrNone ) + { + count++; + } + if( count > 1 ) + { + return KErrAlreadyExists; + } + fullName = KNullDesC(); + RAllocator* iAllocator = MemoryManager::SwitchToFastAllocator(); __UHEAP_MARK; @@ -333,11 +348,7 @@ // Find header files from the Plug-in Repository UpdateHeaderListCacheL(); - - // Adds the server with the specified name to the active scheduler, and issues the - // first request for messages, and leaves if the operation fails - StartL( KhspsThemeServerName ); - + // Initialize remove index iThemeIndexToRemove = KErrNotFound; @@ -386,6 +397,10 @@ iShutdown = CShutdown::NewL( *this ); #endif // _hsps_SERVER_SHUTDOWN_ENABLED_ + // Adds the server with the specified name to the active scheduler, and issues the + // first request for messages, and leaves if the operation fails + StartL( KhspsThemeServerName ); + #ifdef HSPS_LOG_ACTIVE iLogBus->LogText( _L( "hspsThemeServer: server fully constructed" ) ); iLogBus->LogText( _L( "--------------------------------------------------------" ) ); @@ -436,6 +451,7 @@ iLogBus->LogText( _L( "hspsThemeServer: server is shutting down" ) ); #endif + delete iFileMan; if( iDefinitionRepository ) { iDefinitionRepository->UnregisterObserver( *this ); @@ -482,7 +498,7 @@ delete iBRHandler; iCacheMask = NULL; - + iFsSession.Close(); } @@ -1456,6 +1472,12 @@ { started = ETrue; } + else + { + delete iInstalledSisxThemes[ iThemeIndexToRemove ]; + iInstalledSisxThemes[ iThemeIndexToRemove ] = NULL; + iInstalledSisxThemes.Remove( iThemeIndexToRemove ); + } } } break; @@ -2142,16 +2164,13 @@ #ifdef HSPS_LOG_ACTIVE iLogBus->LogText( _L( "ChspsThemeServer::HandleLanguageChangeL()") ); #endif - - // Set key for fetching previously used language from the cenrep - const TInt KCenrepLangKey = 100000001; - + // The key should already exist const TUint32 fullMask = 0xFFFFFFFF; RArray res; CleanupClosePushL( res ); - iCentralRepository->FindL( KCenrepLangKey, fullMask, res ); + iCentralRepository->FindL( KCenrepKeyLang, fullMask, res ); if ( res.Count() == 0 ) { #ifdef HSPS_LOG_ACTIVE @@ -2163,16 +2182,18 @@ // Check the cenrep key's value TInt prevLanguage = ELangNone; - iCentralRepository->Get( KCenrepLangKey, prevLanguage ); + iCentralRepository->Get( KCenrepKeyLang, prevLanguage ); // If the language has been changed if( iDeviceLanguage != prevLanguage ) { // Update all the ODTs so that the localized configurations can be fetched LocalizeConfigurationsL(); + + UpdateHeaderListCacheL(); // Finally, update the cenrep with the new language - TInt errorCode = iCentralRepository->Set( KCenrepLangKey, iDeviceLanguage ); + TInt errorCode = iCentralRepository->Set( KCenrepKeyLang, iDeviceLanguage ); if ( errorCode ) { #ifdef HSPS_LOG_ACTIVE @@ -2257,6 +2278,57 @@ } // ----------------------------------------------------------------------------- +// ChspsThemeServer::ResetResourcesL() +// ----------------------------------------------------------------------------- +// +void ChspsThemeServer::ResetResourcesL( + ChspsODT& aAppODT ) + { + // If active configuration + TInt confUid = -1; + iCentralRepository->Get( aAppODT.RootUid(), confUid ); + if( confUid == aAppODT.ThemeUid() ) + { + if( !iFileMan ) + { + iFileMan= CFileMan::NewL( iFsSession ); + } + + // Find unique plug-in UIDs from the app configuration + RArray uidArray; + CleanupClosePushL( uidArray ); + hspsServerUtil::FindUniquePluginsL( aAppODT, uidArray ); + + // Remove old copies from the client path, localized copies will be + // restored when the app configuration is fetched again + for( TInt i=0; i < uidArray.Count(); i++ ) + { + ChspsODT* pluginODT = ChspsODT::NewL(); + CleanupStack::PushL( pluginODT ); + + GetConfigurationL( + 0, + uidArray[i], + *pluginODT ); + + if( pluginODT->ThemeUid() ) + { + hspsServerUtil::RemoveResourceFilesL( + *iFileMan, + iFsSession, + aAppODT.RootUid(), + *pluginODT ); + } + + CleanupStack::PopAndDestroy(); + } + + uidArray.Reset(); + CleanupStack::PopAndDestroy( &uidArray ); + } + } + +// ----------------------------------------------------------------------------- // ChspsThemeServer::LocalizeL() // ----------------------------------------------------------------------------- // @@ -2286,6 +2358,8 @@ aEngine, aOdt, requestedLanguage ); + + ResetResourcesL( aOdt ); } else { diff -r 1b207dd38b72 -r ace62b58f4b2 homescreenpluginsrv/hspsmanager/src/hspsthemeserversession.cpp --- a/homescreenpluginsrv/hspsmanager/src/hspsthemeserversession.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreenpluginsrv/hspsmanager/src/hspsthemeserversession.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -796,81 +796,6 @@ } // ----------------------------------------------------------------------------- -// ChspsThemeServerSession::DoCopyResourceFilesL -// ----------------------------------------------------------------------------- -TInt ChspsThemeServerSession::DoCopyResourceFilesL( - ChspsODT& aAppODT, - CFileMan& aFilemanager, - const TInt aConfUid, - const TDesC& aDestination ) - { - TInt error( KErrNone ); - RPointerArray widgetResources; // Objects are not owned. - CleanupClosePushL( widgetResources ); - - // Get resources that need to be copied. - hspsServerUtil::GetValidResourcesL( aAppODT, - aConfUid, - Server().DeviceLanguage(), - widgetResources ); - - // Copy the resources found - for( TInt i = 0; ( i < widgetResources.Count() && !error ); i++ ) - { - ChspsResource* resource = widgetResources[i]; - if( !resource ) - { - continue; - } - - // Get relative path under the themes folder - TPath relativePath; - hspsServerUtil::GetRelativeResourcePath( - resource->FileName(), - relativePath ); - - // Strip language indicator from the relative path - hspsServerUtil::GetLocaleIndependentResourcePath( - resource->Language(), - relativePath ); - - // Finalize target path - TPath targetPath; - targetPath.Copy( aDestination ); - targetPath.Append( relativePath ); - - // Create missing target path and copy files when needed only - error = hspsServerUtil::CopyResourceFileL( - iFs, - aFilemanager, - targetPath, - resource->FileName() ); - if ( !error ) - { -#ifdef HSPS_LOG_ACTIVE - if ( iLogBus ) - { - iLogBus->LogText( - _L( "hspsServerUtil::DoCopyResourceFilesL(): - %S was copied" ), - &targetPath - ); - } -#endif - } - if ( error == KErrAlreadyExists ) - { - error = KErrNone; - } - - } // copy loop - - widgetResources.Reset(); - CleanupStack::PopAndDestroy( 1, &widgetResources ); - - return error; - } - -// ----------------------------------------------------------------------------- // ChspsThemeServerSession::CopyResourceFilesL // (other items were commented in a header). // ----------------------------------------------------------------------------- @@ -918,31 +843,33 @@ { phaseCounter++; - RArray widgetArray; - CleanupClosePushL( widgetArray ); + RArray uidArray; + CleanupClosePushL( uidArray ); // Find unique configuration UIDs from the resource array - FindWidgetUidsL( *odt, widgetArray ); + FindWidgetUidsL( *odt, uidArray ); CFileMan* fileManager = NULL; fileManager = CFileMan::NewL( iFs ); CleanupStack::PushL( fileManager ); // Loop widgets belonging to the root configuration - const TInt uidCount = widgetArray.Count(); + const TInt uidCount = uidArray.Count(); for( TInt i = 0; i < uidCount && !error; i++ ) { // Copy widget's resources to client's private folder - error = DoCopyResourceFilesL( - *odt, - *fileManager, - widgetArray[i], - destinationPath ); + error = hspsServerUtil::CopyResourceFilesL( + *odt, + iFs, + *fileManager, + Server().DeviceLanguage(), + uidArray[i], + destinationPath ); } - widgetArray.Reset(); + uidArray.Reset(); - CleanupStack::PopAndDestroy( 2, &widgetArray ); // fileManager, widgetArray + CleanupStack::PopAndDestroy( 2, &uidArray ); // fileManager, uidArray } // KErrNone //Tidy-up diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/hs_widget_publisher_api/inc/hsdataobserver.h --- a/homescreensrv_plat/hs_widget_publisher_api/inc/hsdataobserver.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/hs_widget_publisher_api/inc/hsdataobserver.h Wed Jun 09 10:01:25 2010 +0300 @@ -58,7 +58,8 @@ EActivate = 1, ///< Activation event: Means that widget has been added to HS as content. EDeactivate = 2, ///< Deactivation event: Means that widget has been removed frm. ESuspend = 3, ///< Suspension event: Means that HS reading widget data is suspended. - EResume = 4 ///< Resume event. Means that HS reading widget data is resumed. + EResume = 4, ///< Resume event. Means that HS reading widget data is resumed. + EPluginshutdown = 5 ///< Plugin Shutdown event. Means widget is removed from HS. }; /** diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/hs_widget_publisher_api/inc/hsglobals.h --- a/homescreensrv_plat/hs_widget_publisher_api/inc/hsglobals.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/hs_widget_publisher_api/inc/hsglobals.h Wed Jun 09 10:01:25 2010 +0300 @@ -80,6 +80,8 @@ _LIT8( KActive, "active" ); _LIT8( KDeActive, "deactive" ); +_LIT8( KPluginshutdown, "pluginshutdown"); + _LIT8( KSuspend, "suspend" ); _LIT8( KResume, "resume" ); _LIT8( KSelected, "selected" ); diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/hs_widget_publisher_api/inc/hswidgetitem.h --- a/homescreensrv_plat/hs_widget_publisher_api/inc/hswidgetitem.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/hs_widget_publisher_api/inc/hswidgetitem.h Wed Jun 09 10:01:25 2010 +0300 @@ -62,13 +62,21 @@ /** */ bool isStringValue(); - + + /** + */ + void triggerAdded(); + + /** + */ + bool isTriggerAdded(); private: std::string mItemName; std::string mItemString; int mItemInt; bool mIsString; + bool mTrigger; }; } diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/hs_widget_publisher_api/inc/hswidgetpublisherimpl.h --- a/homescreensrv_plat/hs_widget_publisher_api/inc/hswidgetpublisherimpl.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/hs_widget_publisher_api/inc/hswidgetpublisherimpl.h Wed Jun 09 10:01:25 2010 +0300 @@ -33,6 +33,7 @@ namespace Hs { class HsWidget; +class HsWidgetItem; typedef std::map WidgetContentIdMapType; @@ -137,8 +138,8 @@ /** */ - int HandleWidgetActionL( const TDesC8& aActionDes, - HsWidget& aWidget ); + void HandleWidgetActionL( const TDesC8& aActionDes, + const TDesC& aContentIdDes, HsWidget& aWidget ); /** */ @@ -172,6 +173,11 @@ /** */ + void InsertWidgetDataIdentifiersL( HsWidget& aWidget, + CLiwDefaultMap* aDataMap, const TDesC& aContentType ); + + /** + */ void InsertWidgetInfoL( HsWidget& aWidget, CLiwDefaultMap* aDataMap ); @@ -190,8 +196,7 @@ /** */ - void InsertItemsTriggersL( HsWidget& aWidget, - CLiwDefaultMap* aTriggerMap ); + void AddItemsActionsL( HsWidget& aWidgetItem, TInt aItemIndex ); /** */ diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/hs_widget_publisher_api/src/hswidgetitem.cpp --- a/homescreensrv_plat/hs_widget_publisher_api/src/hswidgetitem.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/hs_widget_publisher_api/src/hswidgetitem.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -25,7 +25,9 @@ // --------------------------------------------------------------------------- // HsWidgetItem::HsWidgetItem(std::string& aItemName, std::string& aValue): - mItemName(aItemName), mItemString(aValue), mItemInt(0), mIsString(true) + mItemName(aItemName), mItemString(aValue), mItemInt(0), + mIsString(true),mTrigger(false) + { } @@ -102,5 +104,20 @@ return mIsString; } +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +void HsWidgetItem::triggerAdded() + { + mTrigger = true; + } - +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +bool HsWidgetItem::isTriggerAdded() + { + return mTrigger; + } diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/hs_widget_publisher_api/src/hswidgetpublisherimpl.cpp --- a/homescreensrv_plat/hs_widget_publisher_api/src/hswidgetpublisherimpl.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/hs_widget_publisher_api/src/hswidgetpublisherimpl.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -96,8 +96,8 @@ mWidgets.push_back( widget); TInt err( KErrNone ); TRAP( err, + RegisterNotificationL( *widget ); PublishWidgetActionsL( *widget ); - RegisterNotificationL( *widget ); ) if( err != KErrNone ) { @@ -139,11 +139,7 @@ if ( changeMapsList->AtL(index, variant) ) { const CLiwMap* map = variant.AsMap(); - HsWidget* widget = GetWidgetL( map ); - if( !widget ) - { - break; - } + variant.Reset(); if ( map->FindL(KOperation, variant) ) {// Check what triggered a notification variant.Get(operation); @@ -155,11 +151,19 @@ { variant.Get(trigger ); } - if( !HandleWidgetActionL( trigger, *widget ) ) - { - break; - } - HandleWidgetItemActionL( trigger, *widget ); + HsWidget* widget = GetWidgetL( map ); + if( !widget ) + { + break; + } + variant.Reset(); + if ( !map->FindL( KContentId, variant ) ) + { + User::Leave( KErrNotFound ); + } + HandleWidgetActionL( trigger, variant.AsDes(), *widget ); + HandleWidgetItemActionL( trigger, *widget ); + variant.Reset(); } } } @@ -172,12 +176,39 @@ // // --------------------------------------------------------------------------- // -int HsWidgetPublisherImpl::HandleWidgetActionL( const TDesC8& aActionDes, - HsWidget& aWidget ) +void HsWidgetPublisherImpl::HandleWidgetActionL( const TDesC8& aActionDes, + const TDesC& aContentIdDes, HsWidget& aWidget ) { - int ret( 1 );//not found IHsDataObserver::EEvent action( IHsDataObserver::EUnknown ); TranslateObserverAction( aActionDes, action ); + switch( action ) + { + case IHsDataObserver::EActivate: + { + // add / update the Instance Id + std::wstring contentId( ToWideStringL( aContentIdDes ) ); + mWidgetContentIds[aWidget.getIdentifier()] = contentId; + }; + break; + case IHsDataObserver::EDeactivate: + { + mWidgetContentIds.erase( aWidget.getIdentifier() ); + }; + break; + case IHsDataObserver::EPluginshutdown: + { + // remove widget data when widget removed from screen + CLiwDefaultMap* cpdatamap = CLiwDefaultMap::NewLC(); + InsertWidgetDataIdentifiersL( aWidget, cpdatamap ); + // removal may fail if the client has already removed the data + TRAP_IGNORE( RemoveFromCpsL( cpdatamap, KCpData ) ); + CleanupStack::PopAndDestroy( cpdatamap ); + }; + break; + default : + break; + }; + if( action == IHsDataObserver::EActivate || action == IHsDataObserver::EDeactivate || action == IHsDataObserver::EResume || @@ -193,22 +224,8 @@ { observerError = exception.getReason(); } - - if ( action == IHsDataObserver::EDeactivate ) - { - // remove widget data when widget removed from screen - CLiwDefaultMap* cpdatamap = CLiwDefaultMap::NewLC(); - InsertWidgetDataIdentifiersL( aWidget, cpdatamap ); - // removal may fail if the client has already removed the data - TRAP_IGNORE( RemoveFromCpsL( cpdatamap, KCpData ) ); - mWidgetContentIds.erase( aWidget.getIdentifier() ); - CleanupStack::PopAndDestroy( cpdatamap ); - } - User::LeaveIfError( observerError ); - ret = 0; } - return ret; } // --------------------------------------------------------------------------- @@ -222,6 +239,10 @@ { aAction = IHsDataObserver::EActivate; } + if( !aActionDes.Compare( KPluginshutdown() ) ) + { + aAction = IHsDataObserver::EPluginshutdown; + } if( !aActionDes.Compare( KDeActive() ) ) { aAction = IHsDataObserver::EDeactivate; @@ -426,16 +447,8 @@ cpdatamap->InsertL( KDataMap, TLiwVariant( datamap ) ); InsertWidgetACLL( cpdatamap ); - int count = aWidget.itemsCount(); - if( count > 0 ) - { - CLiwDefaultMap* triggermap = CLiwDefaultMap::NewLC(); - InsertItemsTriggersL( aWidget, triggermap ); - cpdatamap->InsertL( KActionMap, TLiwVariant( triggermap ) ); - CleanupStack::PopAndDestroy( triggermap ); - } - - // add to CPS + + // add to CPS TLiwGenericParam item( KItem, TLiwVariant( cpdatamap )); inParam->AppendL( item ); mServiceInterface->ExecuteCmdL( KAdd, @@ -450,6 +463,15 @@ outParam->Reset(); inParam->Reset(); User::LeaveIfError( ret ); + + int count = aWidget.itemsCount(); + for ( TInt itemIndex = 0; itemIndex< count; itemIndex++) + { + if ( ! aWidget.getWidgetItem(itemIndex)->isTriggerAdded() ) + { + AddItemsActionsL( aWidget, itemIndex ); + } + } } // --------------------------------------------------------------------------- @@ -666,32 +688,14 @@ std::string strIdentifier( GetWidgetIdentifierFromPublisherNameL( *publisherName ) ); CleanupStack::PopAndDestroy( publisherName ); - publisherName = 0; + CleanupStack::PopAndDestroy( &variant ); - TBuf contentIdDesc; - if ( !aMap->FindL( KContentId, variant ) ) - { - User::Leave( KErrNotFound ); - } - variant.Get( contentIdDesc ); - CleanupStack::PopAndDestroy( &variant ); - std::wstring contentId( ToWideStringL( contentIdDesc ) ); - std::string strTemplate; std::string strWidgetName; - if( CheckIfWidgetExist(strTemplate, strWidgetName, strIdentifier, ETrue) ) { ret = &GetWidget( strTemplate, strWidgetName, strIdentifier); - - // verify that content id does not change - __ASSERT_DEBUG( !mWidgetContentIds.count( ret->getIdentifier() ) || - mWidgetContentIds[ret->getIdentifier()] == contentId, - User::Invariant() ); - - mWidgetContentIds[ret->getIdentifier()] = contentId; } - return ret; } @@ -774,7 +778,17 @@ // --------------------------------------------------------------------------- // void HsWidgetPublisherImpl::InsertWidgetDataIdentifiersL( HsWidget& aWidget, - CLiwDefaultMap* aDataMap ) + CLiwDefaultMap* aDataMap ) + { + InsertWidgetDataIdentifiersL( aWidget, aDataMap, KAll ); + } + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +void HsWidgetPublisherImpl::InsertWidgetDataIdentifiersL( HsWidget& aWidget, + CLiwDefaultMap* aDataMap, const TDesC& aContentType ) { WidgetContentIdMapType::const_iterator contentIdIter = mWidgetContentIds.find( aWidget.getIdentifier() ); @@ -788,7 +802,7 @@ HBufC* publisherName = StdStringToUnicodeLC( GetPublisherNameL( aWidget ) ); aDataMap->InsertL( KPublisherId, TLiwVariant( *publisherName ) ); - aDataMap->InsertL( KContentType, TLiwVariant( KAll ) ); + aDataMap->InsertL( KContentType, TLiwVariant( aContentType ) ); aDataMap->InsertL( KContentId, TLiwVariant( contentId ) ); CleanupStack::PopAndDestroy( publisherName ); @@ -938,29 +952,56 @@ // // --------------------------------------------------------------------------- // -void HsWidgetPublisherImpl::InsertItemsTriggersL( HsWidget& aWidget, - CLiwDefaultMap* aTriggerMap ) +void HsWidgetPublisherImpl::AddItemsActionsL(HsWidget& aWidget, TInt aItemIndex ) { - int count = aWidget.itemsCount(); - CLiwDefaultMap* activateAction = CLiwDefaultMap::NewLC(); - activateAction->InsertL( KPluginId, TLiwVariant( KCASpaAppLauncherPlugin ) ); - + HsWidgetItem* widgetItem = aWidget.getWidgetItem(aItemIndex); + TPtrC8 itemName = ((TUint8*)widgetItem->getItemName().c_str()); + + CLiwGenericParamList* inParam = &(mServiceHandler->InParamListL()); + CLiwGenericParamList* outParam = &(mServiceHandler->OutParamListL()); + + + TLiwGenericParam type(KType, TLiwVariant(KCpData)); + inParam->AppendL(type); + + CLiwDefaultMap* cpdatamap = CLiwDefaultMap::NewLC(); + HBufC* itemName16 = Utf8ToUnicodeLC(itemName ); + InsertWidgetDataIdentifiersL( aWidget, cpdatamap, itemName16->Des() ); + CleanupStack::PopAndDestroy( itemName16 ); + + CLiwDefaultMap* mapAction = CLiwDefaultMap::NewLC(); + CLiwDefaultMap* activateAction = CLiwDefaultMap::NewLC(); CLiwDefaultMap* activate = CLiwDefaultMap::NewLC(); activate->InsertL( KType, TLiwVariant( KActionValueLaunchApplication ) ); activate->InsertL( KLaunchMethod, TLiwVariant( KLaunchMethodValueCmdLine ) ); activate->InsertL( KApplicationUid, TLiwVariant( iWidgetUid ) ); activate->InsertL( KApaCommand, TLiwVariant( KApaCommandBackground ) ); - + + activateAction->InsertL( KPluginId, TLiwVariant( KCASpaAppLauncherPlugin ) ); activateAction->InsertL( KData, TLiwVariant( activate ) ); - - for (int index = 0; index < count; index++) - { - HsWidgetItem* const item = aWidget.getWidgetItem( index ); - TPtrC8 itemName = ((TUint8*)item->getItemName().c_str()); - aTriggerMap->InsertL( itemName, TLiwVariant( activateAction )); - } CleanupStack::PopAndDestroy( activate ); - CleanupStack::PopAndDestroy( activateAction ); + + mapAction->InsertL(itemName, TLiwVariant( activateAction )); + CleanupStack::PopAndDestroy( activateAction ); + cpdatamap->InsertL( KActionMap, TLiwVariant( mapAction ) ); + CleanupStack::PopAndDestroy( mapAction ); + + InsertWidgetACLL( cpdatamap ); + + TLiwGenericParam item( KItem, TLiwVariant( cpdatamap )); + inParam->AppendL( item ); + + mServiceInterface->ExecuteCmdL( KAdd, *inParam, *outParam ); + TInt ret= ObtainErrorCode( *outParam ); + + CleanupStack::PopAndDestroy( cpdatamap ); + item.Reset(); + type.Reset(); + outParam->Reset(); + inParam->Reset(); + User::LeaveIfError( ret ); + + widgetItem->triggerAdded(); } // --------------------------------------------------------------------------- diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/idlefw_api/group/bld.inf --- a/homescreensrv_plat/idlefw_api/group/bld.inf Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/idlefw_api/group/bld.inf Wed Jun 09 10:01:25 2010 +0300 @@ -22,6 +22,7 @@ DEFAULT PRJ_EXPORTS +../inc/aisystemuids.hrh MW_LAYER_PLATFORM_EXPORT_PATH(aisystemuids.hrh) ../inc/aiuicontrolleruid.hrh MW_LAYER_PLATFORM_EXPORT_PATH(aiuicontrolleruid.hrh) ../inc/aiconsts.h MW_LAYER_PLATFORM_EXPORT_PATH(aiconsts.h) ../inc/aifweventhandler.h MW_LAYER_PLATFORM_EXPORT_PATH(aifweventhandler.h) diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/idlefw_api/inc/aisystemuids.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreensrv_plat/idlefw_api/inc/aisystemuids.hrh Wed Jun 09 10:01:25 2010 +0300 @@ -0,0 +1,154 @@ +/* +* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: UIDs for the Active Idle subsystem components. +* +*/ + + +#ifndef AISYSTEMUIDS_HRH +#define AISYSTEMUIDS_HRH + +/** + * AI3 Test Application. + */ +#define AI3_UID_EXE_TEST_APPLICATION 0x2001CB4F + +/** + * Ecom implementation uid for XML UI controller. + */ +#define AI3_UID_ECOM_IMPLEMENTATION_UICONTROLLER_XML 0x2001952C +#define AI_UID_ECOM_IMPLEMENTATION_UICONTROLLER_XML 0x102750F2 + +/** + * Ecom implementation uid for native UI controller. + */ +#define AI3_UID_ECOM_IMPLEMENTATION_UICONTROLLER_NATIVE 0x2001952E +#define AI_UID_ECOM_IMPLEMENTATION_UICONTROLLER_NATIVE 0x102750F4 + +/** + * Ecom implementation uid for Device Status plugin. + */ +#define AI_UID_ECOM_IMPLEMENTATION_CONTENTPUBLISHER_DEVSTAPLUGIN 0x102750F8 + +/** + * Ecom implementation uid for Device Status plugin. + */ +#define AI_UID_ECOM_IMPLEMENTATION_CONTENTPUBLISHER_SHORTCUTPLUGIN 0x102750FA + +/** + * Ecom implementation uid for AI Profile plug-in. + */ +#define AI_UID_ECOM_IMPLEMENTATION_CONTENTPUBLISHER_PROFILEPLUGIN 0x10275101 + +/** + * Ecom implementation uid for sat plugin. + */ +#define AI_UID_ECOM_IMPLEMENTATION_CONTENTPUBLISHER_SATPLUGIN 0x102078EB + +/** + * Ecom dll uid for XML UI controller. + */ +#define AI3_UID_ECOM_DLL_UICONTROLLER_XML 0x2001952A +#define AI_UID_ECOM_DLL_UICONTROLLER_XML 0x102750F1 + + +/** + * Ecom dll uid for native UI controller. + */ +#define AI3_UID_ECOM_DLL_UICONTROLLER_NATIVE 0x2001952D +#define AI_UID_ECOM_DLL_UICONTROLLER_NATIVE 0x102750F3 + +/** + * Ecom dll uid for device status plugin. + */ +#define AI_UID_ECOM_DLL_CONTENTPUBLISHER_DEVSTAPLUGIN 0x102750F7 + +/** + * Common UID3 for Active Idle framework components. + */ +#define AI_UID3_AIFW_COMMON 0x102750F0 + +/** + * Uid3 for AI framework dll. + */ +#define AI_UID3_AIFW_DLL AI_UID3_AIFW_COMMON + +/** + * Uid3 for AI framework launcher exe. + */ +#define AI_UID3_AIFW_EXE AI_UID3_AIFW_COMMON + +/** + * SID for aifw launcher exe. + */ +#define AI_SID_AIFW_EXE AI_UID3_AIFW_EXE + +/** + * Uid3 for AI Voice Dial UI. + */ +#define AI_UID3_VOICE_DIAL_UI 0x101F8543 + +/** + * Uid3 for ai3 layoutengine + */ +#define AI3_UID_LAYOUT_ENGINE 0x2001CB50 + +/** + * Uid3 for ai3 utils + */ +#define AI3_UID_UTILS 0x2001CB51 + +/** + * Uids for rendering plugins + */ +#define AI3_UID_RENDERING_PLUGIN_BITMAPFACTORY 0x2001952F +#define AI3_UID_RENDERING_PLUGIN_BITMAPFACTORY_IMPLEMENTATION 0x20019530 + +#define AI3_UID_RENDERING_PLUGIN_MENUFACTORY 0x20019582 +#define AI3_UID_RENDERING_PLUGIN_MENUFACTORY_IMPLEMENTATION 0x20019583 + +#define AI3_UID_RENDERING_PLUGIN_NEWSTICKERFACTORY 0x20019584 +#define AI3_UID_RENDERING_PLUGIN_NEWSTICKERFACTORY_IMPLEMENTATION 0x20019585 + +#define AI3_UID_RENDERING_PLUGIN_NPPLUGINFACTORY 0x20019586 +#define AI3_UID_RENDERING_PLUGIN_NPPLUGINFACTORY_IMPLEMENTATION 0x20019587 + +#define AI3_UID_RENDERING_PLUGIN_POPUPFACTORY 0x20019588 +#define AI3_UID_RENDERING_PLUGIN_POPUPFACTORY_IMPLEMENTATION 0x20019589 + +#define AI3_UID_RENDERING_PLUGIN_TEXTFACTORY 0x2001958A +#define AI3_UID_RENDERING_PLUGIN_TEXTFACTORY_IMPLEMENTATION 0x2001958B + +#define AI3_UID_RENDERING_PLUGIN_CLOCKFACTORY 0x2001CB52 +#define AI3_UID_RENDERING_PLUGIN_CLOCKFACTORY_IMPLEMENTATION 0x2001CB52 + +#define AI3_UID_RENDERING_PLUGIN_VIEWFACTORY 0x2001958E +#define AI3_UID_RENDERING_PLUGIN_VIEWFACTORY_IMPLEMENTATION 0x2001958F + +#define AI3_UID_RENDERING_PLUGIN_VOLUMECONTROLFACTORY 0x20019590 +#define AI3_UID_RENDERING_PLUGIN_VOLUMECONTROLFACTORY_IMPLEMENTATION 0x20019591 + +#define AI3_RENDERING_PLUGIN_ECOM_FACTORY_UID 0x20019592 + +#define AI3_EXTERNAL_RENDERING_PLUGIN_ECOM_UID 0x200286DF + +#define AI3_UID_RENDERING_PLUGIN_TEXTEDITORFACTORY 0x20022FD3 +#define AI3_UID_RENDERING_PLUGIN_TEXTEDITORFACTORY_IMPLEMENTATION 0x20022FD3 + +#define AI3_UID_RENDERING_PLUGIN_ANIMATIONFACTORY 0x200286E2 +#define AI3_UID_RENDERING_PLUGIN_ANIMATIONFACTORY_IMPLEMENTATION 0x200286E2 + +#endif // AISYSTEMUIDS_HRH + + diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/menu_content_service_api/inc/mcsmenuitem.h --- a/homescreensrv_plat/menu_content_service_api/inc/mcsmenuitem.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/menu_content_service_api/inc/mcsmenuitem.h Wed Jun 09 10:01:25 2010 +0300 @@ -40,6 +40,7 @@ enum TFlags ///< Item flags. { + ENoFlag = 0x0, ///< Item has no flags. ELockDelete = 0x1, ///< Item cannot be deleted. ELockName = 0x2, ///< Item cannot be renamed. ELockIcon = 0x4, ///< Icon cannot be changed. diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/inc/mt_hspsconfigurationif.h --- a/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/inc/mt_hspsconfigurationif.h Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/inc/mt_hspsconfigurationif.h Wed Jun 09 10:01:25 2010 +0300 @@ -409,6 +409,11 @@ */ void RequestNotify_6_L(); /** + * Test case function for test case SisxUpgrade(1) + * See HSPS module test specification + */ + void SisxUpgrade_1_L(); + /** * Test case function for test case SisxInstallation(1) * See HSPS module test specification */ diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/src/mt_hspsconfigurationif.cpp --- a/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/src/mt_hspsconfigurationif.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/src/mt_hspsconfigurationif.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -263,9 +263,9 @@ // Remove test configuration resource files TRAP( err, RemoveResourceFilesL( iFileserver ) ); if ( err != KErrNone ) - { - EUNIT_FAIL_TEST( "Teardown failed." ); - } + { + EUNIT_FAIL_TEST( "Teardown failed." ); + } } //------------------------------------------------------------------------------ @@ -2640,6 +2640,211 @@ EUNIT_PRINT( _L8( "Test step passed" ) ); } + +//------------------------------------------------------------------------------ +// Test case: SisxUpgrade(1) +//------------------------------------------------------------------------------ +void MT_CHSPSConfigurationIf::SisxUpgrade_1_L() + { + // Pre conditions + + // Attach to HSPS + EUNIT_PRINT( _L8( "Pre conditions: Attach to HSPS service IConfiguration interface" ) ); + AttachServiceL( KHSPS, KHSPSConfigurationIf, KHSPSTestAppUid ); + + // Test step 1: + EUNIT_PRINT( _L8( "Test step 1: simulate installation of a SISX package" ) ); + + CFileMan* fileManager = CFileMan::NewL( iFileserver ); + CleanupStack::PushL( fileManager ); + + // Copy installation files to c\private\200159c0\import + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\0\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\0\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\1\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\1\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\9\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\9\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\widgetconfiguration.xml" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\" ), + CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\manifest.dat" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\" ), + CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\plugin_0998_101FB657_2000B133_1.0.dat" ), + _L( "c:\\private\\200159c0\\import\\" ), + CFileMan::EOverWrite ) ); + + // Wait until configuration is installed + User::After( 4000000 ); + + // Make sure "InstalledWidget" is installed + if ( !BaflUtils::FileExists( iFileserver, _L( "c:\\private\\200159c0\\themes\\2456\\270513751\\536916275\\1.0\\InstallWidgetConf.o0000" ) ) ) + { + // Installation failed - remove imports to be able to re-run the test again + // The ChspsThemeServer::HandleConfigurationImportsL does handle newly + // added files only + User::LeaveIfError( fileManager->RmDir( _L( "c:\\private\\200159c0\\import\\0998\\" ) ) ); + fileManager->Attribs( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133.dat" ), + 0, KEntryAttReadOnly, TTime( 0 ) ); // TTime(0) = preserve original time stamp. + User::LeaveIfError( fileManager->Delete( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ) ) ); + + // Leave - the test was not successfull + User::Leave( KErrGeneral ); + } + EUNIT_PRINT( _L8( "Test step passed" ) ); + + // Test step 1: + EUNIT_PRINT( _L8( "Test step 2: simulate upgrade to v2 of a SISX package" ) ); + // Copy installation files to c\private\200159c0\import + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget_v2\\0\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\2.0\\0\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget_v2\\1\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\2.0\\1\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget_v2\\9\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\2.0\\9\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget_v2\\widgetconfiguration.xml" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\2.0\\" ), + CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget_v2\\manifest.dat" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\2.0\\" ), + CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget_v2\\plugin_0998_101FB657_2000B133_2.0.dat" ), + _L( "c:\\private\\200159c0\\import\\" ), + CFileMan::EOverWrite ) ); + + // Wait until configuration is installed + User::After( 4000000 ); + + // Make sure "InstalledWidget v1" is removed + if ( BaflUtils::FileExists( iFileserver, _L( "c:\\private\\200159c0\\themes\\2456\\270513751\\536916275\\1.0\\InstallWidgetConf.o0000" ) ) ) + { + // Installation failed - remove imports to be able to re-run the test again + // The ChspsThemeServer::HandleConfigurationImportsL does handle newly + // added files only + User::LeaveIfError( fileManager->RmDir( _L( "c:\\private\\200159c0\\import\\0998\\" ) ) ); + fileManager->Attribs( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ), + 0, KEntryAttReadOnly, TTime( 0 ) ); // TTime(0) = preserve original time stamp. + fileManager->Attribs( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_2.0.dat" ), + 0, KEntryAttReadOnly, TTime( 0 ) ); // TTime(0) = preserve original time stamp. + + User::LeaveIfError( fileManager->Delete( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ) ) ); + User::LeaveIfError( fileManager->Delete( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_2.0.dat" ) ) ); + // Leave - the test was not successfull + User::Leave( KErrGeneral ); + } + + EUNIT_PRINT( _L8( "Test step passed" ) ); + + + // Test step 3: + EUNIT_PRINT( _L8( "Test step 3: simulate uninstalation of a SISX package" ) ); + // Remove installation files to c\private\200159c0\import + User::LeaveIfError( fileManager->RmDir( _L( "c:\\private\\200159c0\\import\\0998\\" ) ) ); + fileManager->Attribs( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ), + 0, KEntryAttReadOnly, TTime( 0 ) ); // TTime(0) = preserve original time stamp. + fileManager->Attribs( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_2.0.dat" ), + 0, KEntryAttReadOnly, TTime( 0 ) ); // TTime(0) = preserve original time stamp. + User::LeaveIfError( fileManager->Delete( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ) ) ); + User::LeaveIfError( fileManager->Delete( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_2.0.dat" ) ) ); + + EUNIT_PRINT( _L8( "Test step passed" ) ); + User::After( 4000000 ); + + // check + // Copy installation files to c\private\200159c0\import + EUNIT_PRINT( _L8( "Test step 4: simulate installation of a SISX package" ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\0\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\0\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\1\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\1\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\9\\" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\9\\" ), + CFileMan::ERecurse|CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\widgetconfiguration.xml" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\" ), + CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\manifest.dat" ), + _L( "c:\\private\\200159c0\\import\\0998\\101FB657\\2000B133\\1.0\\" ), + CFileMan::EOverWrite ) ); + User::LeaveIfError( fileManager->Copy( + _L( "c:\\data\\mt_hsps\\installed_widget\\plugin_0998_101FB657_2000B133_1.0.dat" ), + _L( "c:\\private\\200159c0\\import\\" ), + CFileMan::EOverWrite ) ); + + // Wait until configuration is installed + User::After( 4000000 ); + + // Make sure "InstalledWidget" is installed + if ( !BaflUtils::FileExists( iFileserver, _L( "c:\\private\\200159c0\\themes\\2456\\270513751\\536916275\\1.0\\InstallWidgetConf.o0000" ) ) ) + { + // Installation failed - remove imports to be able to re-run the test again + // The ChspsThemeServer::HandleConfigurationImportsL does handle newly + // added files only + User::LeaveIfError( fileManager->RmDir( _L( "c:\\private\\200159c0\\import\\0998\\" ) ) ); + fileManager->Attribs( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ), + 0, KEntryAttReadOnly, TTime( 0 ) ); // TTime(0) = preserve original time stamp. + User::LeaveIfError( fileManager->Delete( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ) ) ); + + // Leave - the test was not successfull + User::Leave( KErrGeneral ); + } + + EUNIT_PRINT( _L8( "Test step passed" ) ); + + // Test step 2: + EUNIT_PRINT( _L8( "Test step 5: simulate un-installation of the SISX package" ) ); + + // Remove installation files from c\private\200159c0\import + User::LeaveIfError( fileManager->RmDir( _L( "c:\\private\\200159c0\\import\\0998\\" ) ) ); + fileManager->Attribs( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133.dat" ), + 0, + KEntryAttReadOnly, + TTime( 0 ) ); // TTime(0) = preserve original time stamp. + User::LeaveIfError( fileManager->Delete( _L( "c:\\private\\200159c0\\import\\plugin_0998_101FB657_2000B133_1.0.dat" ) ) ); + // Removing of *.dat file causes configuration uninstallation + // Wait until configuration is uninstalled + User::After( 4000000 ); + + // Make sure "InstalledWidget" is uninstalled + if ( BaflUtils::FileExists( iFileserver, _L( "c:\\private\\200159c0\\themes\\2456\\270513751\\536916275\\1.0\\InstallWidgetConf.o0000" ) ) ) + { + User::Leave( KErrGeneral ); + } + + EUNIT_PRINT( _L8( "Test step passed" ) ); + + CleanupStack::PopAndDestroy( fileManager ); + }; + + + + //------------------------------------------------------------------------------ // Test case: SisxInstallation(1) //------------------------------------------------------------------------------ @@ -3423,11 +3628,11 @@ SetupL, SetPluginSettings_6_L, Teardown ) EUNIT_TEST( - "GetPluginSettings(1)", - "IConfiguration", - "GetPluginSettings", - "FUNCTIONALITY", - SetupL, GetPluginSettings_1_L, Teardown ) + "GetPluginSettings(1)", + "IConfiguration", + "GetPluginSettings", + "FUNCTIONALITY", + SetupL, GetPluginSettings_1_L, Teardown ) EUNIT_TEST( "GetPluginSettings(2)", @@ -3569,13 +3774,20 @@ "FUNCTIONALITY", SetupL, RequestNotify_6_L, Teardown ) - EUNIT_TEST( + EUNIT_TEST( + "SisxUpgrade(1)", + "IConfiguration", + "SisxUpgrade", + "FUNCTIONALITY", + SetupL, SisxUpgrade_1_L, Teardown ) + + EUNIT_TEST( "SisxInstallation(1)", "IConfiguration", "SisxInstallation", "FUNCTIONALITY", SetupL, SisxInstallation_1_L, Teardown ) - + EUNIT_TEST( "NativeInstallation(1)", "IConfiguration", diff -r 1b207dd38b72 -r ace62b58f4b2 homescreensrv_plat/sapi_menucontent/mcsservice/src/mcsexecuteaction.cpp --- a/homescreensrv_plat/sapi_menucontent/mcsservice/src/mcsexecuteaction.cpp Tue May 25 13:01:39 2010 +0300 +++ b/homescreensrv_plat/sapi_menucontent/mcsservice/src/mcsexecuteaction.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -124,10 +124,15 @@ void CMCSExecuteAction::RunL() { TInt err = iStatus.Int(); + if ( err == KErrNone ) { - ExecuteL( iItemId, iAction ); - } + TRAP( err, ExecuteL( iItemId, iAction ) ); + } + if(err != KErrNone) + { + NotifyRequestResult( err ); + } } // --------------------------------------------------------------------------- @@ -137,6 +142,10 @@ TInt CMCSExecuteAction::RunError(TInt aError) { NotifyRequestResult( aError ); + if ( (aError != KErrDiskFull) && (aError != KErrNoMemory)) + { + aError = KErrNone; + } return aError; } diff -r 1b207dd38b72 -r ace62b58f4b2 idlefw/plugins/devicestatus/inc/ainetworkinfolistener.h --- a/idlefw/plugins/devicestatus/inc/ainetworkinfolistener.h Tue May 25 13:01:39 2010 +0300 +++ b/idlefw/plugins/devicestatus/inc/ainetworkinfolistener.h Wed Jun 09 10:01:25 2010 +0300 @@ -225,7 +225,8 @@ ERegistrationStatusReceived = 0x00000010, ENetworkInfoChangeReceived = 0x00000020, EProgrammableOperatorInfoReceived = 0x00000040, - EProgrammableOperatorInfoReceivedOk = 0x00000080 + EProgrammableOperatorInfoReceivedOk = 0x00000080, + ECSRegistrationNotOk = 0x00000100 }; /** diff -r 1b207dd38b72 -r ace62b58f4b2 idlefw/plugins/devicestatus/src/ainetworkinfolistener.cpp --- a/idlefw/plugins/devicestatus/src/ainetworkinfolistener.cpp Tue May 25 13:01:39 2010 +0300 +++ b/idlefw/plugins/devicestatus/src/ainetworkinfolistener.cpp Wed Jun 09 10:01:25 2010 +0300 @@ -155,8 +155,8 @@ void CAiNetworkInfoListener::HandleNetworkMessage( const TNWMessages aMessage ) { - __PRINTS("XAI: Handle NW message"); - //Insert message into the message cache. Only one messsage of one type. + __PRINT(__DBG_FORMAT("XAI: Handle NW message %d"), aMessage ); + //Insert message into the message cache. Only one messsage of one type. TRAPD( err, iMessageCache->InsertIsqL( aMessage, iKeyProperties ) ); if( err == KErrAlreadyExists ) { @@ -249,8 +249,8 @@ // Registration status and network information must have been received. // Operator name information must have been received. // Device must be camped to a network. + // CS registration should be completed (only valid in AT&T NW) - TBool csAlphaFlag( EFalse ); switch ( aMessage ) { case MNWMessageObserver::ENWMessageNetworkInfoChange: @@ -296,7 +296,13 @@ if ( !( RPacketService::KCapsRxCSCall & iInfo.iDynamicCapsFlags ) ) { - csAlphaFlag = ETrue; + __PRINTS("XAI: CS registration failed"); + iReceivedMessageFlags |= ECSRegistrationNotOk; + } + else + { + __PRINTS("XAI: CS registration ok"); + iReceivedMessageFlags &= ~ECSRegistrationNotOk; } } FeatureManager::UnInitializeLib(); @@ -316,6 +322,7 @@ ( ENetworkInfoChangeReceived & iReceivedMessageFlags ) && ( ERegistrationStatusReceived & iReceivedMessageFlags ) && ( iInfo.iStatus == ENWStatusCurrent ) ); + TBool csAlphaFlag( ECSRegistrationNotOk & iReceivedMessageFlags ); return !serviceProviderNameFetched || diff -r 1b207dd38b72 -r ace62b58f4b2 idlefw/plugins/mcsplugin/group/qgn_mcsplugin_log_out.svg --- a/idlefw/plugins/mcsplugin/group/qgn_mcsplugin_log_out.svg Tue May 25 13:01:39 2010 +0300 +++ b/idlefw/plugins/mcsplugin/group/qgn_mcsplugin_log_out.svg Wed Jun 09 10:01:25 2010 +0300 @@ -1,123 +1,127 @@ -