equal
deleted
inserted
replaced
183 for (TUint index=0; index < iDataProviders.Count(); index++) |
183 for (TUint index=0; index < iDataProviders.Count(); index++) |
184 { |
184 { |
185 if ((iDataProviders[index]->DataProviderId() != iDpIdDeviceDp) |
185 if ((iDataProviders[index]->DataProviderId() != iDpIdDeviceDp) |
186 && (iDataProviders[index]->DataProviderId() != iDpIdProxyDp)) |
186 && (iDataProviders[index]->DataProviderId() != iDpIdProxyDp)) |
187 { |
187 { |
188 iDataProviderIds.Append(iDataProviders[index]->DataProviderId()); |
188 iDataProviderIds.AppendL(iDataProviders[index]->DataProviderId()); |
189 } |
189 } |
190 } |
190 } |
191 |
191 |
192 // Ensure that the data provider set is ordered on DataProvider Id. |
192 // Ensure that the data provider set is ordered on DataProvider Id. |
193 iDataProviders.Sort(TLinearOrder<CMTPDataProvider>(CMTPDataProvider::LinearOrderDPId)); |
193 iDataProviders.Sort(TLinearOrder<CMTPDataProvider>(CMTPDataProvider::LinearOrderDPId)); |
482 { |
482 { |
483 __FLOG(_L8("File DP first level enum complete")); |
483 __FLOG(_L8("File DP first level enum complete")); |
484 Cancel(); |
484 Cancel(); |
485 |
485 |
486 //clean the root level snapshot |
486 //clean the root level snapshot |
487 iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(ETrue); |
487 TRAP_IGNORE(iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(ETrue)); |
488 |
488 |
489 //Schedule again to scan subdir |
489 //Schedule again to scan subdir |
490 iEnumerationState = EEnumeratingSubDirFiles; |
490 iEnumerationState = EEnumeratingSubDirFiles; |
491 |
491 |
492 } |
492 } |
498 |
498 |
499 if ((iEnumeratingDps.Count() == 0) && iDpIdArrayIndex >= iDataProviderIds.Count()) |
499 if ((iEnumeratingDps.Count() == 0) && iDpIdArrayIndex >= iDataProviderIds.Count()) |
500 { |
500 { |
501 Cancel(); |
501 Cancel(); |
502 iEnumerationState = EEnumeratingCleanDBSnapshot; |
502 iEnumerationState = EEnumeratingCleanDBSnapshot; |
503 iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(EFalse); |
503 TRAP_IGNORE(iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(EFalse)); |
504 |
|
505 |
|
506 } |
504 } |
507 else |
505 else |
508 { |
506 { |
509 if ((iEnumeratingDps.Count() == 0) && (iEnumerationPhase != DataProviderL(iDataProviderIds[iDpIdArrayIndex]).DataProviderConfig().UintValue(MMTPDataProviderConfig::EEnumerationPhase))) |
507 if ((iEnumeratingDps.Count() == 0) && (iEnumerationPhase != DataProviderL(iDataProviderIds[iDpIdArrayIndex]).DataProviderConfig().UintValue(MMTPDataProviderConfig::EEnumerationPhase))) |
510 { |
508 { |