FCL/sf/app/recents: comparison logsui/logsengine/logssymbianos/src/logsdbconnector.cpp

equal deleted inserted replaced

-:f27aebe284bb
+:c5af8598d22c
 #include <centralrepository.h>
 #include <LogsDomainCRKeys.h>
 // CONSTANTS
+// Telephony Configuration API
+// Keys under this category are used in defining telephony configuration.
+const TUid logsTelConfigurationCRUid = {0x102828B8};
+// Amount of digits to be used in contact matching.
+// This allows a customer to variate the amount of digits to be matched.
+const TUint32 logsTelMatchDigits = 0x00000001;
 // ----------------------------------------------------------------------------
 // LogsDbConnector::LogsDbConnector
 // ----------------------------------------------------------------------------
 //
 if ( !mReader ){
 LOGS_QDEBUG( "logs [ENG]    Not initialized, failure" )
 return -1;
 }
 mReader->updateDetails(clearCached);
-readCompleted( mEvents.count() ); //to notify of model update
 return 0;
 }
 // ----------------------------------------------------------------------------
 // LogsDbConnector::stateChanged
 LOGS_QDEBUG( "logs [ENG] -> LogsDbConnector::initL(), resource control enabled" )
 LogsCommonData::getInstance().configureReadSize(
 logsReadSizeCompressEnabled, LogsEvent::DirUndefined);
 mCompressionEnabled = true;
 }
+//Get number of digits used to match
+int matchLen;
+TRAPD( err, getTelNumMatchLenL(matchLen) )
+if ( err ){
+LOGS_QDEBUG( "logs [ENG]    Getting tel num match len failed, use default" );
+matchLen = logsDefaultMatchLength;
+}
+LOGS_QDEBUG_2( "logs [ENG]    Tel number match length", matchLen )
+LogsCommonData::getInstance().setTelNumMatchLen(matchLen);
 }
 // ----------------------------------------------------------------------------
 // LogsDbConnector::clearList
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // LogsDbConnector::clearEvent
 // ----------------------------------------------------------------------------
 //
-bool LogsDbConnector::clearEvents(const QList<int>& eventIds)
+bool LogsDbConnector::clearEvents(const QList<LogsEvent*>& events)
 {
 bool asyncClearingStarted(false);
 if ( mLogsRemove ){
 bool async(false);
-int err = mLogsRemove->clearEvents(eventIds, async);
+int err = mLogsRemove->clearEvents(events, async);
 asyncClearingStarted = ( !err && async );
 }
+if ( asyncClearingStarted ){
+// Lock reader while removing events one-by-one as reading
+// might have chance to run while removing is still in progress
+// which looks bad at UI layer.
+mReader->lock(true);
+}
 return asyncClearingStarted;
 }
 // ----------------------------------------------------------------------------
 // LogsDbConnector::markEventsSeen
 // ----------------------------------------------------------------------------
 //
-bool LogsDbConnector::markEventsSeen(const QList<int>& eventIds)
+bool LogsDbConnector::markEventsSeen(const QList<LogsEvent*>& events)
 {
 LOGS_QDEBUG( "logs [ENG] -> LogsDbConnector::markEventsSeen()" )
 if ( !mReader ){
 return false;
 }
-foreach( int currId, eventIds ){
+foreach( LogsEvent* ev, events ){
-if ( !mEventsSeen.contains(currId) ){
+if ( !mEventsSeen.contains(*ev) ){
-mEventsSeen.append(currId);
+mEventsSeen.append(*ev);
-}
+foreach ( const LogsEvent& mergedEv, ev->mergedDuplicates() ){
-}
+if ( !mEventsSeen.contains(mergedEv) ){
+mEventsSeen.append(mergedEv);
-LOGS_QDEBUG_2( "logs [ENG] -> event ids:", mEventsSeen );
+}
+}
+}
+}
 int err = doMarkEventSeen();
 LOGS_QDEBUG_2( "logs [ENG] <- LogsDbConnector::markEventsSeen(), marking err:",
 err )
 return ( err == 0 );
 } else {
 removedIndexes.append(mEvents.at(i)->index());
 }
 }
 emit dataRemoved(removedIndexes);
-deleteRemoved( numEventsLeftInMemory );
+deleteInvalidEvents( numEventsLeftInMemory );
 mReader->stop();
 }
 LOGS_QDEBUG( "logs [ENG] <- LogsDbConnector::compressData()" )
 return 0;
 }
 error = 0;
 }
 }
 // ----------------------------------------------------------------------------
-// LogsDbConnector::deleteRemoved
+// LogsDbConnector::deleteInvalidEvents
 // ----------------------------------------------------------------------------
 //
-void LogsDbConnector::deleteRemoved(int newEventCount)
+void LogsDbConnector::deleteInvalidEvents(int newEventCount)
 {
 // Remove events which are not anymore in db nor in model,
 // such events are always at end of list
 while ( mEvents.count() > newEventCount ){
 delete mEvents.takeLast();
 // ----------------------------------------------------------------------------
 //
 void LogsDbConnector::removeCompleted()
 {
 LOGS_QDEBUG( "logs [ENG] -> LogsDbConnector::removeCompleted()" )
+mReader->lock(false);
 emit clearingCompleted(0);
 LOGS_QDEBUG( "logs [ENG] <- LogsDbConnector::removeCompleted()" )
 }
 // ----------------------------------------------------------------------------
 //
 void LogsDbConnector::logsRemoveErrorOccured(int err)
 {
 LOGS_QDEBUG_2( "logs [ENG] <-> LogsDbConnector::logsRemoveErrorOccured(), err:", err )
+mReader->lock(false);
 emit clearingCompleted(err);
 // TODO: error handling
 LOGS_QDEBUG( "logs [ENG] <- LogsDbConnector::logsRemoveErrorOccured()" )
 }
 // ----------------------------------------------------------------------------
 // LogsDbConnector::readCompleted
 // ----------------------------------------------------------------------------
 //
-void LogsDbConnector::readCompleted(int readCount)
+void LogsDbConnector::readCompleted()
 {
 LOGS_QDEBUG( "logs [ENG] -> LogsDbConnector::readCompleted()" )
 LOGS_QDEBUG_EVENT_ARR(mEvents)
 // Find out updated, added and removed events
 mRemovedEventIndexes.clear();
 mUpdatedEventIndexes.clear();
 mAddedEventIndexes.clear();
+mModelEvents.clear();
+QList<LogsEvent*> toBeDeletedEvents;
 for ( int i = 0; i < mEvents.count(); i++ ){
-if ( !mEvents.at(i)->isInView() ){
+LogsEvent* currEvent = mEvents.at(i);
-mRemovedEventIndexes.append( mEvents.at(i)->index() );
+if ( !currEvent->isInView() ){
-} else if ( mEvents.at(i)->eventState() == LogsEvent::EventUpdated ) {
+if ( currEvent->index() >= 0 ){
-mUpdatedEventIndexes.append( mEvents.at(i)->index() );
+mRemovedEventIndexes.append( currEvent->index() );
-} else if ( mEvents.at(i)->eventState() == LogsEvent::EventAdded ) {
+}
-mAddedEventIndexes.append( mEvents.at(i)->index() );
+toBeDeletedEvents.append( mEvents.takeAt(i) );
-}
+i--;
-}
+} else {
+currEvent->setIndex(i);
-bool doModelDataReset( !mRemovedEventIndexes.isEmpty() ||
+if ( currEvent->eventState() == LogsEvent::EventUpdated ) {
-!mAddedEventIndexes.isEmpty() ||
+mUpdatedEventIndexes.append(i);
-!mUpdatedEventIndexes.isEmpty() );
+} else if ( currEvent->eventState() == LogsEvent::EventAdded ) {
-if ( doModelDataReset ){
+mAddedEventIndexes.append(i);
-mModelEvents.clear();
+}
-int numValidEvents = qMin(mEvents.count(), readCount);
+mModelEvents.append(currEvent);
-for ( int i = 0; i < numValidEvents; i++ ){
-mModelEvents.append(mEvents.at(i));
 }
 }
 int changeCount = 0;
 changeCount += mRemovedEventIndexes.isEmpty() ? 0 : 1;
 if ( !mUpdatedEventIndexes.isEmpty() ){
 emit dataUpdated(mUpdatedEventIndexes);
 }
 }
-deleteRemoved(readCount);
+qDeleteAll(toBeDeletedEvents);
 LOGS_QDEBUG( "logs [ENG] <- LogsDbConnector::readCompleted()" )
 }
 // ----------------------------------------------------------------------------
 //
 int LogsDbConnector::doMarkEventSeen()
 {
 int err = -1;
 if ( mEventsSeen.count() > 0 ){
-err = mReader->markEventSeen(mEventsSeen.at(0));
+err = mReader->markEventSeen(mEventsSeen.at(0).logId());
 }
 return err;
 }
 // ----------------------------------------------------------------------------
 } else {
 }
 return continueModify;
 }
+// ----------------------------------------------------------------------------
+// LogsDbConnector::getTelNumMatchLenL
+// ----------------------------------------------------------------------------
+//
+void LogsDbConnector::getTelNumMatchLenL(int& matchLen)
+{
+TInt tempMatchLen;
+CRepository* repository = CRepository::NewL(logsTelConfigurationCRUid);
+CleanupStack::PushL(repository);
+User::LeaveIfError( repository->Get(logsTelMatchDigits, tempMatchLen) );
+CleanupStack::PopAndDestroy(repository);
+matchLen = tempMatchLen;
+}

changeset 16	c5af8598d22c
parent 11	64a47b97e1e1
child 17	90fe74753f71