MCL/sf/mw/homescreensrv: comparison homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp

equal deleted inserted replaced

-:1b207dd38b72
+:ace62b58f4b2
 _LIT( KDoubleBackSlash, "\\" );
 _LIT( KUpgradePluginWild, "upgrade_plugin_*.dat" );
 // Just in case emulator cannot read system version we use this to
 // 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
 // E32Main
 // Server process entry-point
 // -----------------------------------------------------------------------------
 //
 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;
 CTrapCleanup* cleanup=CTrapCleanup::New();
 TInt r=KErrNoMemory;
 iSecurityEnforcer->SetLogBus( iLogBus );
 #endif
 // 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;
 // Listen to changes in any key
 iCenRepListener->SetupAll();
 #ifdef _hsps_SERVER_SHUTDOWN_ENABLED_
 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( "--------------------------------------------------------" ) );
 #endif
 }
 {
 #ifdef HSPS_LOG_ACTIVE
 iLogBus->LogText( _L( "hspsThemeServer: server is shutting down" ) );
 #endif
+delete iFileMan;
 if( iDefinitionRepository )
 {
 iDefinitionRepository->UnregisterObserver( *this );
 }
 delete iBRObserver;
 delete iActiveBackupClient;
 delete iBRHandler;
 iCacheMask = NULL;
 iFsSession.Close();
 }
 // -----------------------------------------------------------------------------
 // ChspsThemeServer::NewSessionL
 if( !err )
 {
 started = ETrue;
 }
+else
+{
+delete iInstalledSisxThemes[ iThemeIndexToRemove ];
+iInstalledSisxThemes[ iThemeIndexToRemove ] = NULL;
+iInstalledSisxThemes.Remove( iThemeIndexToRemove );
+}
 }
 }
 break;
 default:
 {
 void ChspsThemeServer::HandleLanguageChangeL()
 	{
 #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<TUint32> res;
 	CleanupClosePushL( res );
-	iCentralRepository->FindL( KCenrepLangKey, fullMask, res );
+	iCentralRepository->FindL( KCenrepKeyLang, fullMask, res );
 	if ( res.Count() == 0 )
 		{
 #ifdef HSPS_LOG_ACTIVE
 		iLogBus->LogText( _L( "ChspsThemeServer::HandleLanguageChangeL(): - Couldn't find %d key from the HSPS cenrep!" ), KCenrepLangKey );
 #endif
 		User::Leave( KErrNotFound );
 		}
 	// 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
 	        iLogBus->LogText( _L( "ChspsThemeServer::HandleLanguageChangeL(): - Failed to update the cenrep!" ) );
 #endif
 		} // count
 	}
 // -----------------------------------------------------------------------------
+// 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<TInt> 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()
 // -----------------------------------------------------------------------------
 //
 TBool ChspsThemeServer::LocalizeL(
 		ChspsDefinitionEngineInterface& aEngine,
 	    // Apply plugin and application specific DTD files
 	    domChanged = LocalizeApplicationConfigurationL(
 	            aEngine,
 	            aOdt,
 	            requestedLanguage );
+ResetResourcesL( aOdt );
 	    }
 	else
 	    {
 	    // Apply plugin specific DTD files only
 	    domChanged = LocalizePluginConfigurationL(

branch	RCL_3
changeset 23	ace62b58f4b2
parent 22	1b207dd38b72
child 25	9e077f9a342c