equal
deleted
inserted
replaced
1260 User::Leave( KErrArgument ); |
1260 User::Leave( KErrArgument ); |
1261 break; |
1261 break; |
1262 } |
1262 } |
1263 } |
1263 } |
1264 areaBase->InternalizeL(readStream); |
1264 areaBase->InternalizeL(readStream); |
1265 areaArray.Append(areaBase); |
1265 areaArray.AppendL(areaBase); |
1266 CleanupStack::Pop(1); //areaBase |
1266 CleanupStack::Pop(1); //areaBase |
1267 } |
1267 } |
1268 |
1268 |
1269 CLbtGeoHybrid* hybrid = CLbtGeoHybrid::NewLC(areaArray); |
1269 CLbtGeoHybrid* hybrid = CLbtGeoHybrid::NewLC(areaArray); |
1270 // Set the wlan area to the trigger |
1270 // Set the wlan area to the trigger |
1798 view.PutL(); |
1798 view.PutL(); |
1799 |
1799 |
1800 TLbtTriggerModifiedInfo info; |
1800 TLbtTriggerModifiedInfo info; |
1801 info.iTriggerId = triggerId; |
1801 info.iTriggerId = triggerId; |
1802 info.iAreaType = static_cast<CLbtGeoAreaBase::TGeoAreaType>(view.ColInt8(ELbtDbTriggerAreaType));; |
1802 info.iAreaType = static_cast<CLbtGeoAreaBase::TGeoAreaType>(view.ColInt8(ELbtDbTriggerAreaType));; |
1803 iIdArray.Append(info); |
1803 iIdArray.AppendL(info); |
1804 |
1804 |
1805 if( currentValidity == TLbtTriggerDynamicInfo::EInvalid && |
1805 if( currentValidity == TLbtTriggerDynamicInfo::EInvalid && |
1806 aValidity == TLbtTriggerDynamicInfo::EValid) |
1806 aValidity == TLbtTriggerDynamicInfo::EValid) |
1807 { |
1807 { |
1808 iCountOfEnabledAndValidTrigger++; |
1808 iCountOfEnabledAndValidTrigger++; |
2048 if(iIdArray.Count() == 0) |
2048 if(iIdArray.Count() == 0) |
2049 { |
2049 { |
2050 MLbtTriggerStore::TLbtTriggerModifiedInfo info; |
2050 MLbtTriggerStore::TLbtTriggerModifiedInfo info; |
2051 info.iTriggerId = aTriggerId; |
2051 info.iTriggerId = aTriggerId; |
2052 info.iAreaType = areaType; |
2052 info.iAreaType = areaType; |
2053 iIdArray.Append(info); |
2053 iIdArray.AppendL(info); |
2054 } |
2054 } |
2055 |
2055 |
2056 iView.DeleteL(); |
2056 iView.DeleteL(); |
2057 } |
2057 } |
2058 |
2058 |
2407 else |
2407 else |
2408 { |
2408 { |
2409 info.iStartupProcess = KNullUid; |
2409 info.iStartupProcess = KNullUid; |
2410 } |
2410 } |
2411 |
2411 |
2412 iIdArray.Append(info); |
2412 TInt error = iIdArray.Append(info); |
|
2413 if( error != KErrNone ) |
|
2414 { |
|
2415 LOG1("Failed to appenf info to the array:%d",error); |
|
2416 } |
2413 } |
2417 } |
2414 |
2418 |
2415 |
2419 |
2416 // ----------------------------------------------------------------------------- |
2420 // ----------------------------------------------------------------------------- |
2417 // CLbtDbTriggersManager::TriggersModified |
2421 // CLbtDbTriggersManager::TriggersModified |
2419 // |
2423 // |
2420 void CLbtDbTriggersManager::TriggersModified(RArray<TLbtTriggerModifiedInfo>& aArray) |
2424 void CLbtDbTriggersManager::TriggersModified(RArray<TLbtTriggerModifiedInfo>& aArray) |
2421 { |
2425 { |
2422 for( TInt i = 0;i<iIdArray.Count();i++ ) |
2426 for( TInt i = 0;i<iIdArray.Count();i++ ) |
2423 { |
2427 { |
2424 aArray.Append(iIdArray[i]); |
2428 TInt error = aArray.Append(iIdArray[i]); |
|
2429 if( error != KErrNone ) |
|
2430 { |
|
2431 LOG1("Failed to append modified triggers:%d",error); |
|
2432 return; |
|
2433 } |
2425 } |
2434 } |
2426 iIdArray.Reset(); |
2435 iIdArray.Reset(); |
2427 } |
2436 } |
2428 |
2437 |
2429 // ----------------------------------------------------------------------------- |
2438 // ----------------------------------------------------------------------------- |