FCL/sf/mw/locationsrv: comparison locationtriggering/ltcontainer/src/lbtramtriggersmanager.cpp

equal deleted inserted replaced

-:788b770ce3ae
+:3825cf2dc8c2
 	{
 	CompleteClientRequest( KErrNotFound );
 return;
 	}
-CLbtListTriggerOptions* listOptions=aFilter->ListOptions();
 // Store client data
 iFilter = aFilter;
 iClientSecurityPolicy = aSecurityPolicy;
 iClientTriggerArray = &aTriggers;
 iCurrentOperation = EOperationListing;
 if( tEntry == NULL )
 break;
 CLbtListTriggerOptions* listOptions = iFilter->ListOptions();
-CLbtContainerFilter* contFilter = iFilter->ContainerFilter();
 CLbtExtendedTriggerInfo* contExtInfo = tEntry->ExtendedTriggerInfo();
 TLbtTriggerDynamicInfoFieldsMask dynInfoMask;
 TLbtTriggerAttributeFieldsMask attrMask;
 listOptions->GetRetrievedFields(attrMask,dynInfoMask);
 TLbtTriggerDataMask dataMask = iFilter->DataMask();
 ++count;
 if( !LbtContainerUtilities::RunSecurityPolicy( tEntry, iClientSecurityPolicy ) )
 {
 continue;
 }
 CLbtContainerTriggerEntry* entry = NULL;
 CLbtTriggerEntry* clientEntry = NULL;
 iFilterBase->ProcessFilter(tEntry, isFilterPresent, isEntryRequested);
 if(isFilterPresent > 0 && isEntryRequested)
 {
 entry = CLbtContainerTriggerEntry::NewL();
-CleanupStack::PushL( entry );
+iClientTriggerArray->Append( entry );
 clientEntry = CLbtSessionTrigger::NewL();
-entry->SetTriggerEntry(clientEntry);
+entry->SetTriggerEntry( clientEntry );
 if( attrMask & CLbtTriggerEntry::EAttributeId )
 {
 clientEntry->SetId(trigEntry->Id());
 }
 if( attrMask & CLbtTriggerEntry::EAttributeCondition )
 {
 CLbtTriggerConditionArea* cond = static_cast<CLbtTriggerConditionArea*>(trigEntry->GetCondition());
 // Condition area to be sent back to client
-CLbtTriggerConditionArea* condArea=CLbtTriggerConditionArea::NewL();
+CLbtTriggerConditionArea* condArea=CLbtTriggerConditionArea::NewLC();
 CLbtGeoAreaBase* area = LbtContainerUtilities::CopyGeoAreaL( cond->TriggerArea() );
 condArea->SetTriggerArea( area );
 condArea->SetDirection( cond->Direction() );
+CleanupStack::Pop( condArea );
 clientEntry->SetCondition( condArea );
 }
 TLbtTriggerDynamicInfo* info = new TLbtTriggerDynamicInfo;
 TBool isDynInfoPresent=EFalse;
 {
 isDynInfoPresent=ETrue;
 info->iFiredLocality=tEntry->DynInfo()->iFiredLocality;
 }
+if(isDynInfoPresent)
+{
+entry->SetDynInfo(info);
+}
+else
+{
+delete info;
+}
 if( dataMask & CLbtContainerTriggerEntry::EContainerAttributeHysteresisRadius )
 {
 if(clientExtInfo == NULL)
 {
 clientExtInfo=CLbtExtendedTriggerInfo::NewL();
 if(clientExtInfo!=NULL)
 {
 entry->SetExtendedTriggerInfo(clientExtInfo);
 }
+}
-if(isDynInfoPresent)
-{
-entry->SetDynInfo(info);
-}
-if( entry != NULL )
-{
-iClientTriggerArray->Append( entry );
-CleanupStack::Pop( entry );
-}
-}
 }
 if( tEntry == NULL )
 {
 if( iClientTriggerArray->Count() == 0 )
 // Trigger Entry supplied by the client
 CLbtTriggerEntry* trigEntry = iClientTriggerEntry->TriggerEntry();
 CLbtExtendedTriggerInfo* trigExtInfo = iClientTriggerEntry->ExtendedTriggerInfo();
 TLbtTriggerDynamicInfo* trigDynInfo = iClientTriggerEntry->DynInfo();
+// Append the modification information
+MLbtTriggerStore::TLbtTriggerModifiedInfo info;
+info.iTriggerId = entry->TriggerEntry()->Id();
+TSecureId sid = entry->ExtendedTriggerInfo()->OwnerSid();
+info.iOwner.iUid= (TInt)(sid.iId);
+iIdArray.Append(info);
 /* contTrigEntry is the trigger entry which is a part of
 * the container trigger entry retrieved from the tree
 */
-CLbtSessionTrigger* contTrigEntry = static_cast <CLbtSessionTrigger*>(entry->TriggerEntry());
+CLbtSessionTrigger* contTrigEntry = NULL;
+if( entry->TriggerEntry() )
+{
+contTrigEntry = static_cast <CLbtSessionTrigger*>(entry->TriggerEntry());
+CLbtTriggerConditionArea* condArea = static_cast <CLbtTriggerConditionArea*>(contTrigEntry->GetCondition());
+CLbtGeoAreaBase* geoArea = condArea->TriggerArea();
+info.iAreaType = geoArea->Type();
+}
+else
+{
+contTrigEntry=CLbtSessionTrigger::NewL();
+entry->SetTriggerEntry( contTrigEntry );
+}
 /* Contextinfo is the extended information present in the entry
 * retrieved from the tree
 */
 CLbtExtendedTriggerInfo* contExtInfo = entry->ExtendedTriggerInfo();
-TLbtTriggerDynamicInfo* contDynInfo = NULL;
+TLbtTriggerDynamicInfo* contDynInfo =  entry->DynInfo();
-contDynInfo = entry->DynInfo();
-// Append the modification information
-MLbtTriggerStore::TLbtTriggerModifiedInfo info;
-info.iTriggerId = entry->TriggerEntry()->Id();
-CLbtTriggerConditionArea* condArea = static_cast <CLbtTriggerConditionArea*>(contTrigEntry->GetCondition());
-CLbtGeoAreaBase* geoArea = condArea->TriggerArea();
-info.iAreaType = geoArea->Type();
-TSecureId sid = entry->ExtendedTriggerInfo()->OwnerSid();
-info.iOwner.iUid= (TInt)(sid.iId);
-iIdArray.Append(info);
 if(trigEntry!=NULL)
 {
 if( iAttrMask & CLbtTriggerEntry::EAttributeId )
 {
-if(contTrigEntry==NULL)
+contTrigEntry->SetId(trigEntry->Id());
-{
-contTrigEntry=CLbtSessionTrigger::NewL();
-}
-contTrigEntry->SetId(trigEntry->Id());
 }
 if( iAttrMask & CLbtTriggerEntry::EAttributeName )
 {
-if(contTrigEntry==NULL)
-{
-contTrigEntry=CLbtSessionTrigger::NewL();
-}
 contTrigEntry->SetNameL(trigEntry->Name());
 }
 if( iAttrMask & CLbtTriggerEntry::EAttributeState )
 {
-if(contTrigEntry==NULL)
-{
-contTrigEntry=CLbtSessionTrigger::NewL();
-}
 contTrigEntry->SetState(trigEntry->State());
 }
 if( iAttrMask & CLbtTriggerEntry::EAttributeRearmTime )
 {
-if(contTrigEntry==NULL)
-{
-contTrigEntry=CLbtSessionTrigger::NewL();
-}
 contTrigEntry->SetTimeToRearm((trigEntry->TimeToRearm()));
 }
 if( iAttrMask & CLbtTriggerEntry::EAttributeRequestor )
 {
-if(contTrigEntry==NULL)
-{
-contTrigEntry=CLbtSessionTrigger::NewL();
-}
 //clientEntry->SetRequestorL(trigEntry->GetRequestor());
 }
 if( iAttrMask & CLbtTriggerEntry::EAttributeManagerUi )
 {
-if(contTrigEntry==NULL)
-{
-contTrigEntry=CLbtSessionTrigger::NewL();
-}
 contTrigEntry->SetManagerUi(trigEntry->ManagerUi());
 }
 if( iAttrMask & CLbtTriggerEntry::EAttributeCondition )
 {
-if(contTrigEntry==NULL)
-{
-contTrigEntry=CLbtSessionTrigger::NewL();
-}
 CLbtTriggerConditionArea* condArea = static_cast <CLbtTriggerConditionArea*>(contTrigEntry->GetCondition());
 CLbtGeoAreaBase* geoArea = condArea->TriggerArea();
 CLbtTriggerConditionArea* cond=static_cast <CLbtTriggerConditionArea*> (trigEntry->GetCondition());
 if(geoArea->Type() == CLbtGeoAreaBase::ECircle)
 else if(geoArea->Type() == CLbtGeoAreaBase::ECellular)
 {
 CLbtGeoCell* containerCell = static_cast<CLbtGeoCell*>(geoArea);
 CLbtGeoCell* geoCell = static_cast <CLbtGeoCell*> (cond->TriggerArea());
-// TODO: Check if we need to retreive GSM and WCDMA info
 containerCell->SetNetworkType(geoCell->NetworkType());
 containerCell->SetNetworkCountryCode(geoCell->NetworkCountryCode());
 containerCell->SetNetworkIdentityCode(geoCell->NetworkIdentityCode());
 containerCell->SetLocationAreaCode(geoCell->LocationAreaCode());
 containerCell->SetCellId(geoCell->CellId());
 if( iDataMask & CLbtContainerTriggerEntry::EContainerAttributeHysteresisRadius )
 {
 if(contExtInfo==NULL)
 {
 contExtInfo=CLbtExtendedTriggerInfo::NewL();
+entry->SetExtendedTriggerInfo( contExtInfo );
 }
 contExtInfo->SetHysteresisRadius(trigExtInfo->HysteresisRadius());
 }
 if( iDataMask & CLbtContainerTriggerEntry::EContainerAttributeIsFired )
 {
 if(contExtInfo==NULL)
 {
 contExtInfo=CLbtExtendedTriggerInfo::NewL();
+entry->SetExtendedTriggerInfo( contExtInfo );
 }
 contExtInfo->SetTriggerFiredState(trigExtInfo->IsTriggerFired());
 }
 if( iDataMask & CLbtContainerTriggerEntry::EContainerAttributeFireInfo )
 {
 if(contExtInfo==NULL)
 {
 contExtInfo=CLbtExtendedTriggerInfo::NewL();
+entry->SetExtendedTriggerInfo( contExtInfo );
 }
 contExtInfo->SetFiredInfo( trigExtInfo->GetFiredInfo() );
 }
 if( iDataMask & CLbtContainerTriggerEntry::EContainerAttributeOwnerSid )
 {
 if(contExtInfo==NULL)
 {
 contExtInfo=CLbtExtendedTriggerInfo::NewL();
+entry->SetExtendedTriggerInfo( contExtInfo );
 }
 contExtInfo->SetOwnerSid(trigExtInfo->OwnerSid());
 }
 if( iDataMask & CLbtContainerTriggerEntry::EContainerAttributeRectTriggerArea )
 {
 if(contExtInfo==NULL)
 {
 contExtInfo=CLbtExtendedTriggerInfo::NewL();
+entry->SetExtendedTriggerInfo( contExtInfo );
 }
 contExtInfo->SetTriggerRectangleArea(trigExtInfo->TriggerReactangleArea());
 }
 if( iDataMask & CLbtContainerTriggerEntry::EContainerAttributeStrategyData )
 {
 if(contExtInfo==NULL)
 {
 contExtInfo=CLbtExtendedTriggerInfo::NewL();
+entry->SetExtendedTriggerInfo( contExtInfo );
 }
 contExtInfo->SetStrategyDataL(trigExtInfo->StategyData());
 }
 if( iDataMask & CLbtContainerTriggerEntry::EContainerAttributeIsTriggerFireOnCreation )
 {
 if(contExtInfo==NULL)
 {
 contExtInfo=CLbtExtendedTriggerInfo::NewL();
+entry->SetExtendedTriggerInfo( contExtInfo );
 }
 contExtInfo->SetTriggerFireOnCreation(trigExtInfo->IsTriggerFireOnCreation());
 }
 }
 if( iDataMask & CLbtContainerTriggerEntry::EContainerDynInfoAttributeValidity )
 {
 if(contDynInfo == NULL)
 {
 contDynInfo = new TLbtTriggerDynamicInfo;
+entry->SetDynInfo( contDynInfo );
 }
 contDynInfo->iValidity = trigDynInfo->iValidity;
 }
 }
 			TBool isEntryRequested = EFalse;
 			filter->ProcessFilter(tEntry,isFilterPresent,isEntryRequested);
 			if(isFilterPresent>0 && isEntryRequested)
 				{
-				CLbtTriggerEntry* trigEntry = tEntry->TriggerEntry();
+				AppendTriggerInfo(tEntry);
-			   	AppendTriggerInfo(tEntry);
 				}
 		}
 		tEntry=iTriggerIdTree->GetNextEntryL();
 	}
 {
 TLbtTriggerDynamicInfo * info = new TLbtTriggerDynamicInfo;
 info->iValidity = aValidity;
 entry->SetDynInfo(info);
 }
-CLbtTriggerEntry* trigEntry = entry->TriggerEntry();
 AppendTriggerInfo(entry);
 }
 }
 User::RequestComplete(status,KErrNone);
 }
 TInt isFilterPresent = 0;
 TBool isEntryRequested = ETrue;
 iFilterBase->ProcessFilter(tEntry,isFilterPresent,isEntryRequested);
 if(isFilterPresent > 0 && isEntryRequested)
 {
-CLbtTriggerEntry* trigEntry = tEntry->TriggerEntry();
 AppendTriggerInfo(tEntry);
 }
 }
 tEntry = iTriggerIdTree->GetNextEntryL();
 }

changeset 18	3825cf2dc8c2
parent 0	667063e416a2
child 39	3efc7a0e8755