FCL/sf/mw/homescreensrv: comparison homescreenpluginsrv/hspsmanager/src/hspsmaintenancehandler.cpp

equal deleted inserted replaced

-:6cadd6867c17
+:67f2ed48ad91
 CleanupStack::PushL(headerdata);
 messagePtr.WriteL(2,headerdata->Des(),0);
 CleanupStack::PopAndDestroy(headerdata);
 ThspsRepositoryInfo info( EhspsODTActivated );
-info.iAppUid = odt->RootUid();
 iDefinitionRepository.RegisterNotification( info );
 }
 }
 iDefinitionRepository.Unlock();
 CleanupStack::Pop(&iDefinitionRepository);
 // Get plugin nodes
 TInt pluginCount = pluginsNode->ChildNodes().Length();
 for( TInt pluginIndex=0; pluginIndex < pluginCount; pluginIndex++ )
 {
-nodeArray.AppendL( (ChspsDomNode*)pluginsNode->ChildNodes().Item( pluginIndex ) );
+nodeArray.Append( (ChspsDomNode*)pluginsNode->ChildNodes().Item( pluginIndex ) );
 }
 // Remove the nodes and related resources
 for( TInt pluginIndex=0; pluginIndex < pluginCount; pluginIndex++ )
 {
 ThspsServiceCompletedMessage ret( EhspsRemoveThemeFailed );
 if( !( aSetMask.Flags() & EhspsThemeStatusLicenceeDefault ) )
 {
 RArray<ThspsRepositoryInfo> notifParams;
-CleanupClosePushL( notifParams );
 if( !iDefinitionRepository.Locked() )
 {
 iDefinitionRepository.Lock();
 // In case of error. repository is unlocked
 // Check what is being being uninstalled
 TInt error( KErrNone );
 if ( aSetMask.ConfigurationType() != EhspsAppConfiguration )
 {
-TRAP( error, RemovePluginConfFromRepositoryL( aSetMask, notifParams ) );
+// Fix plugin instances and get notifications from valid cases
+TRAP( error, RemovePluginFromAppConfsL( aSetMask, notifParams ) );
 }
-else
-{
+if( !error )
-TRAP( error, RemoveAppConfFromRepositoryL( aSetMask, notifParams ) );
+{
+// Remove the actual plugin from file system
+TRAP( error, RemoveThemeL( aSetMask ) );
 }
 if( !error )
 {
 // Remove header from the cache
 ret = EhspsRemoveThemeSuccess;
 }
 }
-CleanupStack::PopAndDestroy( &notifParams );
+notifParams.Close();
 }
 return ret;
 }
 void ChspsMaintenanceHandler::RemovePluginFromAppConfsL(
 const ChspsODT& aOdt,
 RArray<ThspsRepositoryInfo>& aNotificationParams )
 {
 __ASSERT_DEBUG( aOdt.ThemeUid(), User::Leave( KErrArgument ) );
 // Loop application configurations
 const TInt count = iHeaderListCache.Count();
 for ( TInt i = 0; i < count; i++ )
 {
 ChspsODT* header = iHeaderListCache.At(i);
 aOdt.ThemeUid(),
 pluginIds[i],
 lastNotification,
 aOdt.ThemeFullName(),
 (TLanguage)( aOdt.OdtLanguage() ) );
-aNotificationParams.AppendL(info);
+aNotificationParams.Append(info);
 }
 #ifdef HSPS_LOG_ACTIVE
 if( iLogBus )
 {
 iLogBus->LogText(
 aOdt.ThemeUid(),
 0,
 ETrue,
 aOdt.ThemeFullName(),
 (TLanguage)( aOdt.OdtLanguage() ) );
-aNotificationParams.AppendL(info);
+aNotificationParams.Append(info);
 }
 }
+pluginIds.Close();
 CleanupStack::PopAndDestroy( 2, appOdt ); // appOdt, pluginIds
 appOdt = NULL;
 } // app configuration
 } // header loop
-}
-// -----------------------------------------------------------------------------
-// RemoveAppConfFromRepositoryL
-// -----------------------------------------------------------------------------
-//
-void ChspsMaintenanceHandler::RemoveAppConfFromRepositoryL(
-const ChspsODT& aOdt,
-RArray<ThspsRepositoryInfo>& /* aNotificationParams */ )
-{
-__ASSERT_DEBUG( aOdt.ThemeUid(), User::Leave( KErrArgument ) );
-ChspsODT* activeAppConf = ChspsODT::NewL();
-CleanupStack::PushL( activeAppConf );
-iThemeServer.GetActivateAppConfigurationL( aOdt.RootUid(), *activeAppConf );
-if ( aOdt.ThemeUid() == activeAppConf->ThemeUid() )
-{
-// Active application configuration removed
-ActivateDefaultAppConfL( aOdt, *activeAppConf );
-}
-CleanupStack::PopAndDestroy( activeAppConf );
-// Remove the actual application configuration from file system
-RemoveThemeL( aOdt );
-}
-// -----------------------------------------------------------------------------
-// RemovePluginConfFromRepositoryL
-// -----------------------------------------------------------------------------
-//
-void ChspsMaintenanceHandler::RemovePluginConfFromRepositoryL(
-const ChspsODT& aOdt,
-RArray<ThspsRepositoryInfo>& aNotificationParams )
-{
-__ASSERT_DEBUG( aOdt.ThemeUid(), User::Leave( KErrArgument ) );
-// Fix plugin instances and get notifications from valid cases
-RemovePluginFromAppConfsL( aOdt, aNotificationParams );
-// Remove the actual plugin configuration from file system
-RemoveThemeL( aOdt );
 }
 // -----------------------------------------------------------------------------
 // ChspsMaintenanceHandler::InvalidateUninstalledPluginInstancesL
 // -----------------------------------------------------------------------------
 odt->SetFlags( aOdt.Flags() );
 odt->SetMultiInstance( aOdt.MultiInstance() );
 User::LeaveIfError( iDefinitionRepository.GetOdtL( *odt ) );
 RArray<ThspsRepositoryInfo> notifParams;
-CleanupClosePushL( notifParams );
 TRAP( errorCode, UpdatePluginFromAppConfsL( *odt, notifParams ));
 if( errorCode )
 {
 ret = EhspsUpdatePluginFailed;
 iDefinitionRepository.RegisterNotification( notifParams[i] );
 }
 }
 }
+notifParams.Close();
-CleanupStack::PopAndDestroy( &notifParams );
 CleanupStack::PopAndDestroy( odt );
 }
 return ret;
 }
 aOdt.ThemeUid(),
 pluginIds[i],
 status,
 aOdt.ThemeFullName(),
 (TLanguage)( aOdt.OdtLanguage() ) );
-aNotificationParams.AppendL(info);
+aNotificationParams.Append(info);
 }
 }
 CleanupStack::PopAndDestroy(); // pluginIds.
 CleanupStack::PopAndDestroy( odt );
 }
 }
 }
 }
 // -----------------------------------------------------------------------------
 // ChspsMaintenanceHandler::UpdatePluginConfigurationL
 // Not supported
 ChspsODT& aOdt)
 {
 // If active application configuration is not "LicenceeRestorable"
 if ( !(aHeader->Flags() & EhspsThemeStatusLicenceeRestorable) )
 {
-// Try to activate default configuation
+// Try to activate a configuation with the LicenceeRestorable status
-ActivateDefaultAppConfL( *aHeader, aOdt );
+ChspsODT* searchMask = ChspsODT::NewL();
+CleanupStack::PushL( searchMask );
+searchMask->SetRootUid( aHeader->RootUid() );
+searchMask->SetFamily( aHeader->Family() );
+searchMask->SetFlags( EhspsThemeStatusLicenceeRestorable );
+TInt pos( 0 );
+iThemeServer.GetConfigurationHeader( *searchMask, aHeader, pos );
+if ( aHeader )
+{
+// Activate licensee restorable configuration
+iThemeServer.ActivateThemeL( *aHeader, aOdt );
+ThspsRepositoryInfo info( EhspsODTActivated );
+iDefinitionRepository.RegisterNotification( info );
+}
+else
+{
+// Licensee restorable configuration not found. There must be
+// at least one licensee restorable configuration per application
+User::Leave( KErrNotFound );
+}
+CleanupStack::PopAndDestroy( searchMask );
 }
 else
 {
 // Reinstall the application configuration from ROM
 iThemeServer.ReinstallConfL( aHeader->RootUid(), aHeader->ThemeUid() );
 }
-}
-// -----------------------------------------------------------------------------
-// ChspsMaintenanceHandler::ActivateDefaultAppConfL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void ChspsMaintenanceHandler::ActivateDefaultAppConfL(
-const ChspsODT& aHeader,
-ChspsODT& aOdt )
-{
-ChspsODT* searchMask = ChspsODT::NewL();
-CleanupStack::PushL( searchMask );
-searchMask->SetRootUid( aHeader.RootUid() );
-searchMask->SetFamily( aHeader.Family() );
-searchMask->SetFlags( EhspsThemeStatusLicenceeRestorable );
-ChspsODT* defaultAppConf( NULL );
-TInt pos( 0 );
-iThemeServer.GetConfigurationHeader( *searchMask, defaultAppConf, pos );
-if ( defaultAppConf )
-{
-// Activate licensee restorable configuration
-iThemeServer.ActivateThemeL( *defaultAppConf, aOdt );
-}
-else
-{
-// Licensee restorable configuration not found. There must be
-// at least one licensee restorable configuration per application
-User::Leave( KErrNotFound );
-}
-CleanupStack::PopAndDestroy( searchMask );
 }
 // -----------------------------------------------------------------------------
 // ChspsMaintenanceHandler::AddErrorConfigurationL()
 // -----------------------------------------------------------------------------
 ChspsDomList& attrList = aConfNode.AttributeList();
 ChspsDomAttribute* attr =
 static_cast<ChspsDomAttribute*>( attrList.FindByName( KConfigurationAttrLocking ) );
 if( attr )
 {
-if( attr->Value().CompareF( KConfLockingLocked ) == 0 ||
+isLocked = ( attr->Value().CompareF( KConfLockingLocked ) == 0 );
-attr->Value().CompareF( KConfLockingPermanent ) == 0 )
-{
-isLocked = ETrue;
-}
 }
 return isLocked;
 }
 // If the plugin configuration hasn't been locked or
 // if there are several locked plugin nodes then remove all the rest
 if( !isLocked || foundLocked )
 {
 // Mark for removal
-nodeArray.AppendL( pluginNode );
+nodeArray.Append( pluginNode );
 }
 else
 {
 // If this is the 1st locked node
 if( !foundLocked )

branch	RCL_3
changeset 130	67f2ed48ad91
parent 118	8baec10861af