FCL/sf/mw/homescreensrv: comparison menucontentsrv/srvsrc/menusrveng.cpp

equal deleted inserted replaced

-:edd621764147
+:1b207dd38b72
 // ---------------------------------------------------------
 //
 CMenuSrvEng::~CMenuSrvEng()
 {
 __ASSERT_DEBUG( !iSessions.Count(), User::Invariant() );
+//TODO iCMenuSrvEngUtils
 delete iGetlistHandler;
 delete iDrmHander;
 delete iChildrenHandler;
 delete iTimedClose;
+delete iCacheHandler;
 delete iCMenuSrvEngUtils;
 iSessions.Close();
 iContentName.Close();
 delete iAppScanner;
 delete iFolderNotifier;
 delete iMcsSatMonitor;
 delete iRunningAppsHandler;
-delete iCacheHandler;
 delete iSuiteHandler;
 delete iEng;
 iMenuSrv.EngineDeleted();
 }
 if ( !aContentName.Length() )
 {
 // A name is required - only dead engines have empty name.
 User::Leave( KErrArgument );
 }
 iContentName.CreateL( aContentName );
 iTimedClose = CTimeout::NewL
 ( CActive::EPriorityStandard, TCallBack( CloseSrvEng, (TAny*)this ) );
 iEng = CMenuEng::NewL( iContentName, *this );
-if (iContentName.Length())
+if ( iContentName.Length() )
 {
+iCMenuSrvEngUtils = CMenuSrvEngUtils::NewL( *iEng );
 iCacheHandler = CMcsCacheHandler::NewL( *iEng, *iCMenuSrvEngUtils );
 iMcsSatMonitor = CMcsSatMonitor::NewL( *iEng );
-iCMenuSrvEngUtils = CMenuSrvEngUtils::NewL( *iEng );
 #ifndef __TEST_DISABLE_APPSCAN
-iAppScanner = CMenuSrvAppScanner::NewL( *iEng ); // Start automatic update.
+// Start automatic update.
-iFolderNotifier =  CMenuSrvFolderCrNotifier::NewL( *iEng ); // Start automatic update.
+iAppScanner = CMenuSrvAppScanner::NewL( *iEng, *iCMenuSrvEngUtils );
+// Start automatic update.
+iFolderNotifier =  CMenuSrvFolderCrNotifier::NewL( *iEng );
 #endif
+iRunningAppsHandler = CMcsRunningAppsHandler::NewL(
-iRunningAppsHandler = CMcsRunningAppsHandler::NewL( *iEng,
+*iEng, *iCacheHandler );
-		*iCacheHandler );
+iDrmHander = CMcsDrmHandler::NewL(
-iDrmHander = CMcsDrmHandler::NewL(
+*this, *iCMenuSrvEngUtils, *iCacheHandler );
-*this,
-*iCMenuSrvEngUtils,
+iChildrenHandler = CMcsChildrenHandler::NewL( *this, *iCacheHandler);
-*iCacheHandler );
-iChildrenHandler = CMcsChildrenHandler::NewL(
-*this,
-*iCacheHandler);
 iSuiteHandler = CMcsSuiteHandler::NewL(*iEng, iContentName);
 iTimedClose->Cancel();
 iTimedClose->After( TTimeIntervalMicroSeconds32( KMenuSrvExitDelay ) );
 }
 }
 // expect any session to remove itself during this.
 for ( TInt i = 0; i < iSessions.Count(); i++ )
 {
 iSessions[i]->EngineEvents( aFolder, aEvents );
 }
 if (iDrmHander)
 {
 iDrmHander->EngineEvents( aFolder, aEvents );
 }
 if (iChildrenHandler)
 	{
 	iChildrenHandler->EngineEvents( aFolder, aEvents );
 	}
 if (iRunningAppsHandler)
 	{
 	iRunningAppsHandler->EngineEvents( aFolder, aEvents );
 	}
 if( iCacheHandler && iCacheHandler->iAttrCache.Count() > 0 )
 {
 iCacheHandler->EngineEvents( aEvents );
 }
 }
 delete iRunningAppsHandler; iRunningAppsHandler = NULL;
 delete iAppScanner; iAppScanner = NULL;
 delete iFolderNotifier; iFolderNotifier = NULL;
 delete iSuiteHandler; iSuiteHandler = NULL;
 delete iEng; iEng = NULL;
 iContentName.Close();
 iTimedClose->Cancel();
 iTimedClose->After( TTimeIntervalMicroSeconds32( KMenuSrvExitDelay ) );
 }
 	}
 void CMenuSrvEng::GetAttributeListL(
 		  TInt aId,
 		  RArray<TPtrC>& aList )
 {
 const CMenuEngObject& obj = iEng->ObjectL(aId);
 TPtrC name, value;
 TBool localized;
 for ( TInt ndx = 0; obj.GetAttribute( ndx, name, value, localized ); ndx++ )
 {
 if( !( name.Compare( KMenuAttrIconFile ) == KErrNone
 || name.Compare( KMenuAttrMaskId ) == KErrNone
 || name.Compare( KMenuAttrIconSkinMajorId ) == KErrNone
 || name.Compare( KMenuAttrIconSkinMinorId ) == KErrNone ))
 {
 aList.AppendL(name);
 }
 }
 AppendExtendedAttrributesL( obj.Type() , aList );
 }
 // ---------------------------------------------------------
 		 TBool& aAttrExists,
 		 TDes& aAttrVal )
 {
 TBool dummy;
 TPtrC val(KNullDesC);
 aAttrExists = iEng->ObjectL(aId).FindAttribute( aAttrName, val, dummy);
 if( !aAttrExists )
 {
 aAttrExists = iCacheHandler->iAttrCache.Find( aId, aAttrName, aAttrVal );
 }
 if ( aAttrExists && val!=KNullDesC() )
 {
 aAttrVal = val;
 }
 else if( !aAttrExists )
 }
 // ---------------------------------------------------------
 // CMenuSrvEng::InstalledSuiteExist
 // ---------------------------------------------------------
 //
 TBool CMenuSrvEng::InstalledSuiteExist(const TDesC& aSuiteName)
 	{
 	return iSuiteHandler->HaveSuite(aSuiteName);
 	}
 // ---------------------------------------------------------
 // CMenuSrvEng::GetSuiteAttributeL
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::GetSuiteAttribute( const TDesC& aSuiteName, const TDesC& aAttrName,
 TBool& aAttrExists, TDes& aAttrVal )
 	{
 	iSuiteHandler->GetAttribute(aSuiteName, aAttrName,
 			aAttrExists, aAttrVal);
 	}
 // ---------------------------------------------------------
 // CMenuSrvEng::GetRunningAppsL()
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::GetRunningAppsL( RArray<TUid>& aArray )
 {
 	iRunningAppsHandler->GetRunningAppsL( aArray );
 	}
 // ---------------------------------------------------------
 // CMenuSrvEng::GetRunningAppsL()
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::GetExtendedAttributesL(TInt aId,
 const TDesC& aAttrName, TBool& aAttrExists,
 TDes& aAttrVal )
 {
 TBool captionInfo(aAttrName.Compare( KMenuAttrShortName ) == KErrNone ||
 aAttrName.Compare( KMenuAttrLongName ) == KErrNone ||
 aAttrName.Compare( KMenuAttrTitleName ) == KErrNone );
 TBool addToCache( ETrue );
 if ( captionInfo )
 {
 CaptionInfoL( aId, aAttrName, aAttrExists, aAttrVal );
 addToCache = EFalse;
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::ApplicationNativeAttributeL(
 		TInt aId, TBool & aAttrExists, TDes & aAttrVal )
 	{
-	const CMenuEngObject & obj = iEng->ObjectL(aId);
+	const CMenuEngObject & aEngObj = iEng->ObjectL(aId);
-	iCMenuSrvEngUtils->IsNative(obj, aAttrExists, aAttrVal);
+aAttrExists = EFalse;
+if( aEngObj.Type().CompareF( KMenuTypeApp ) == KErrNone )
+{
+TInt err;
+TUid uid;
+err = iCMenuSrvEngUtils->GetAppUid( aEngObj, uid );
+if( err == KErrNone )
+{
+TBool native(EFalse);
+err = iCMenuSrvEngUtils->IsNativeL( uid, native );
+if( !err )
+{
+aAttrExists = ETrue;
+if( native )
+{
+aAttrVal = KMenuTrue();
+}
+else
+{
+aAttrVal = KMenuFalse();
+}
+}
+}
+}
+if( !aAttrExists )
+{
+aAttrVal = KNullDesC();
+}
 	}
 // ---------------------------------------------------------
 // CMenuSrvEng::AddToCacheL
 // ---------------------------------------------------------
 attr->SetValueL( aAttrVal ); // Takes ownership.
 attr->SetId( aId ); // New in cache -> not changed.
 iCacheHandler->iAttrCache.AppendL( attr );
 CleanupStack::Pop( attr );
 }
 // ---------------------------------------------------------
 // CMenuSrvEng::CaptionInfoL
 // Functions only for KMenuTypeApp type.
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::CaptionInfoL( TInt aId, const TDesC& aAttrName,
 TBool& aExists, TDes& aAttrVal )
 {
 const CMenuEngObject& obj = iEng->ObjectL(aId);
 if ( obj.Type().Compare( KMenuTypeFolder ) == KErrNone )
 {
 TBool localized;
 TPtrC attrvalue;
 TBool attrExists = obj.FindAttribute( KMenuAttrAppGroupName, attrvalue, localized );
 if ( attrExists )
 {
 aExists = ETrue;
 aAttrVal = attrvalue;
 // ---------------------------------------------------------
 //
 TPtrC CMenuSrvEng::AppCaptionInfoL( const CMenuEngObject& aEngObj,
 const TDesC& aAttrName, TBool& aExists )
 {
 TApaAppInfo info;
 TPtrC val( KNullDesC );
-if( KErrNone == iCMenuSrvEngUtils->GetAppInfo( aEngObj, info ) )
+if( KErrNone == iCMenuSrvEngUtils->GetAppInfoL( aEngObj, info ) )
 {
 aExists = ETrue;
 if( aAttrName.Compare( KMenuAttrTitleName ) == KErrNone ||
 aAttrName.Compare( KMenuAttrShortName ) == KErrNone )
 {
 {
 aExists = EFalse;
 }
 return val;
 }
 // ---------------------------------------------------------
 // CMenuSrvEng::FolderChildrenCountL
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::FolderChildrenCountL( TInt aId, TBool& aExists, TDes& aAttrVal )
 	 {
 	 const CMenuEngObject& obj = iEng->ObjectL(aId);
 	 if( obj.Type().CompareF( KMenuTypeFolder ) == KErrNone )
 	     {
 	     TUint32 childrenCount (0);
 		 RArray<TMenuItem> childrenArray;
 		 CleanupClosePushL( childrenArray );
 		 CMenuFilter* appFilter = CMenuFilter::NewLC();
 		 appFilter->SetFlags(0, TMenuItem::EMissing | TMenuItem::EHidden);
 		 TMenuSrvObjectFilter engFilter( *appFilter );
 		 iEng->GetItemsL(childrenArray, aId, &engFilter, EFalse);
 		 childrenCount = childrenArray.Count();
 		 CleanupStack::PopAndDestroy( appFilter );
 		 CleanupStack::PopAndDestroy( &childrenArray );
 aAttrVal.Num(childrenCount, EDecimal);
 aExists = ETrue;
 	     }
 	 else
 	     {
 	     aAttrVal.Append(KNullDesC());
 	     aExists = EFalse;
 	     }
 	 }
 // ---------------------------------------------------------
 // CMenuSrvEngUtils::GetAppRunningL
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::GetAppRunningL( TInt aId, TBool& aExists, TDes& aAttrVal )
 	 else
 		 {
 		 aAttrVal.Append(KNullDesC());
 		 }
 	 }
 // ---------------------------------------------------------
 // CMenuSrvEng::GetChildrenCount
 // ---------------------------------------------------------
 //
 TUint CMenuSrvEng::GetChildrenCountL( TInt aId )
 	 TBool attrExists (EFalse);
 	 TUint count (0);
 	 RBuf attrVal;
 	 attrVal.CleanupClosePushL();
 	 attrVal.CreateL(KMenuMaxAttrValueLen);
 	 // Get folder children count
 	 FolderChildrenCountL(aId, attrExists, attrVal);
 	 if (attrExists)
 		 {
 		 TLex lex(attrVal);
 		 User::LeaveIfError( lex.Val(count) );
 		 }
 	 CleanupStack::PopAndDestroy( &attrVal );
 	 return count;
 	 }
 // ---------------------------------------------------------
 // CMenuSrvEng::GetlistSizeL
 // ---------------------------------------------------------
 //
 TInt CMenuSrvEng::GetListSizeL( const TDesC8& aSerializedInput )
 	 {
 	 delete iGetlistHandler;
 	 iGetlistHandler = NULL;
 	 iGetlistHandler = CMcsGetlistHandler::NewL( *this );
 	 return iGetlistHandler->GetListSizeL( aSerializedInput );
 	 }
 // ---------------------------------------------------------
 // CMenuSrvEng::CloseOutputBuffer
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::CloseOutputBuffer()
 //
 void CMenuSrvEng::CleanAttributeCache()
 	 {
 	 iCacheHandler->iAttrCache.ResetAndDestroy();
 	 }
 // ---------------------------------------------------------
 // CMenuSrvEng::GetlistSizeL
 // ---------------------------------------------------------
 //
 TPtrC8 CMenuSrvEng::GetListDataL( )
 	 {
 	 return iGetlistHandler->GetListDataL( );
 	 }
 // ---------------------------------------------------------
 // CMenuSrvEng::AppendExtendedAttrributesL
 // ---------------------------------------------------------
 //
 void CMenuSrvEng::AppendExtendedAttrributesL(
 		const TDesC& aType,
 		RArray<TPtrC>& aList )
 	 {
 if ( KErrNone == aType.Compare( KMenuTypeApp ) )
 {
 if( KErrNotFound == aList.Find( KMenuAttrTitleName(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KMenuAttrTitleName ) );
 	}
 if( KErrNotFound == aList.Find( KMenuAttrShortName(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KMenuAttrShortName ) );
 	}
 if( KErrNotFound == aList.Find( KMenuAttrLongName(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KMenuAttrLongName ) );
 	}
 if( KErrNotFound == aList.Find( KMenuAttrDrmProtection(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KMenuAttrDrmProtection ) );
 	}
 }
 else if ( KErrNone == aType.Compare( KMenuTypeFolder ) )
 {
 if( KErrNotFound == aList.Find( KMenuAttrTitleName(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KMenuAttrTitleName ) );
 	}
 if( KErrNotFound == aList.Find( KMenuAttrShortName(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KMenuAttrShortName ) );
 	}
 if( KErrNotFound == aList.Find( KMenuAttrLongName(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KMenuAttrLongName ) );
 	}
 if( KErrNotFound == aList.Find( KChildrenCount(), TIdentityRelation<TPtrC>( CmpAttrName )) )
 	{
 	aList.AppendL( TPtrC( KChildrenCount ) );
 	}
 }
 	 }
 //  End of File

branch	RCL_3
changeset 78	1b207dd38b72
parent 0	79c6a41cd166
child 82	ace62b58f4b2