FCL/sf/app/phone: comparison phoneuis/easydialing/src/easydialingplugin.cpp

equal deleted inserted replaced

-:24062c24fe38
+:2a26698d78ba
 static HBufC* AllocWithoutHighlightSeparatorsLC( TDesC& aDesc );
 static TBool IsItuTCharacter( TChar aChar );
-// FORWARD DECLARATIONS
+static TInt Find( const MVPbkContactLink* aLink, const RPointerArray<MVPbkContactLink>& aArray );
-using namespace AknLayoutScalable_Avkon;
+template <class T>
+inline void CleanupResetAndDestroyPushL(T& aRef);
 // -----------------------------------------------------------------------------
 // CEasyDialingPlugin
 // The default c++ constructor
 LOGSTRING("EasyDialingPlugin: Plugin unloaded");
 }
 // -----------------------------------------------------------------------------
-// Initialize
+// InitializeL
 // Initialises easy dialing.
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingPlugin::InitializeL( CCoeControl& aParent )
 {
 iPredictiveSearchQuery = CPsQuery::NewL();
 }
 // -----------------------------------------------------------------------------
-// GetContactFields
+// SetSortOrderL
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingPlugin::SetSortOrderL( CEasyDialingContactDataManager::TNameOrder aNameOrder )
 {
 RArray<TInt> fields;
 if ( iCompanyNamePCSIndex != KErrNotFound )
 {
 fields.Append(R_VPBK_FIELD_TYPE_COMPANYNAME);
 }
 iPredictiveContactSearchHandler->ChangeSortOrderL( *iContactDataStores[0], fields );
-CleanupStack::PopAndDestroy(); //fields
+CleanupStack::PopAndDestroy( &fields );
 }
 // -----------------------------------------------------------------------------
 // OfferKeyEventL
 // Check the received keypad event and performs user
 }
 else
 {
 // We get here if user e.g. leaves dialer open and goes to Contacts
 // application and does some editing.
+iContactDataManager->Reload(); // to update thumbnails
 AsyncActionLaunchL( ELaunchSearch );
 }
 }
 }
 {
 if ( iSearchString.Length() == 0 )
 {
 return;
 }
 iDiscardCompletingSearches = EFalse;
 iNewSearchNeeded = EFalse;
 iPredictiveSearchQuery->Reset();
 // Called after predictive search has been completed.
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingPlugin::HandlePsResultsUpdate( RPointerArray<CPsClientData>& aResults, RPointerArray<CPsPattern>& aSeqs )
 {
-if (iCenrepListener && iCenrepListener->Value() == 0)
+if ( !IsEnabled() )
 {
 // Easydialing is off. We should arrive here only if user turned it off while a search was happening.
 Reset();
 return;
 }
 TRAPD( leaveError, HandlePsResultsUpdateL( aResults, aSeqs ) );
-if( leaveError )
+if ( leaveError )
 {
 OstTrace1( TRACE_ERROR, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATE, "HandlePsResultsUpdate failed: %d", leaveError );
 LOGSTRING1("EasyDialingPlugin: HandlePsResultsUpdate failed: %d", leaveError );
 }
 }
 }
 OstTrace1( TRACE_NORMAL, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATEL_MATCHES, "Matching results from PCS: %d", numberOfPCSMatches );
 LOGSTRING1("EasyDialingPlugin: Matching results from PCS: %d", numberOfPCSMatches );
-if ( numberOfPCSMatches > 0 )
+// retrieve the name order before adding
-{
+CEasyDialingContactDataManager::TNameOrder nameOrder = iContactDataManager->NameOrder();
-// retrieve the name order before adding
-CEasyDialingContactDataManager::TNameOrder nameOrder = iContactDataManager->NameOrder();
+RPointerArray<MVPbkContactLink> favsFoundByPcs;
+CleanupResetAndDestroyPushL( favsFoundByPcs );
-// map results to old contact match data
-for( TInt i = 0; i < numberOfPCSMatches; i++ )
+// Update the model
-{
+// ----------------
-TInt indexFromEnd = numberOfPCSMatches - i - 1;
+for ( TInt i = 0; i < numberOfPCSMatches; i++ )
+{
-MVPbkContactLink* link = iPredictiveContactSearchHandler->ConvertToVpbkLinkLC(
+TInt indexFromEnd = numberOfPCSMatches - i - 1;
-*(aResults[indexFromEnd]), *iContactManager );
-if ( !iContactDataManager->IsFavL( link ) )
+MVPbkContactLink* link = iPredictiveContactSearchHandler->ConvertToVpbkLinkLC(
-{
+*(aResults[indexFromEnd]), *iContactManager );
-// handle favourites separately, in another loop
+if ( !iContactDataManager->IsFavL( link ) )
-HBufC* contactString = CreateContactStringLC( aResults[ indexFromEnd ], nameOrder );
+{
-CreateListBoxContactStringL( *contactString, link, matchThumbnails, EFalse );
+// handle favourites separately, in another loop
-CleanupStack::PopAndDestroy( contactString );
+HBufC* contactString = CreateContactStringLC( aResults[ indexFromEnd ], nameOrder );
-}
+CreateListBoxContactStringL( *contactString, link, matchThumbnails, EFalse );
+CleanupStack::PopAndDestroy( contactString );
 CleanupStack::PopAndDestroy( link );
+}
-OstTraceExt2( TRACE_NORMAL, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATEL_SHOW_MATCH, "Contact #%d: '%S'", i+1, iContactStringCreationBuffer );
+else
-LOGSTRING2("EasyDialingPlugin: Contact #%d: '%S'", i+1, &iContactStringCreationBuffer );
+{
-}
+// favourites are handled later
+favsFoundByPcs.AppendL( link );
-TInt numberOfFavs( iContactDataManager->NumberOfFavsL() );
+CleanupStack::Pop( link );
-TBuf<KBufferMaxLen> results;
+}
-for ( TInt i = numberOfFavs - 1; i >= 0; i-- )
-{
+OstTraceExt2( TRACE_NORMAL, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATEL_SHOW_MATCH, "Contact #%d: '%S'", i+1, iContactStringCreationBuffer );
-// check if this fav matches the search
+LOGSTRING2( "EasyDialingPlugin: Contact #%d: '%S'", i+1, &iContactStringCreationBuffer );
-HBufC* favContactString = iContactDataManager->FavContactStringLC( i, nameOrder );
+}
+// Search synchronously through all the favourite contacts to ensure
+// that all favourite matches are added to bottom even when number of mathces
+// exceeds the maximum number set to PCS
+TInt numberOfFavs( iContactDataManager->NumberOfFavsL() );
+TBuf<KBufferMaxLen> results;
+for ( TInt i = numberOfFavs - 1; i >= 0; i-- )
+{
+HBufC* favContactString = iContactDataManager->FavContactStringLC( i, nameOrder );
+MVPbkContactLink* link = iContactDataManager->FavLinkLC( i );
+// Check if this fav contact was returned in aResults.
+// It's at least theoretically possible that all matches in aResults
+// are not matched when using LookupMatchL. PCS has completely separate logics
+// for functions SearchL and LookupMatchL and especially with Chinese variant
+// they may return different results.
+TBool found = ( Find( link, favsFoundByPcs ) != KErrNotFound );
+// If this fav contact was not in aResults, then use LookupMatchL
+// to check if this contact is still a match and was excluded from aResults
+// because maximum number of results was exceeded.
+if ( !found )
+{
 results = KNullDesC;
 iPredictiveContactSearchHandler->LookupMatchL(
 *iPredictiveSearchQuery, *favContactString, results );
-if ( results.Length() > 0 )
+found = ( results.Length() > 0 );
-{
+}
-// matches, add this fav to listbox.
-MVPbkContactLink* link = iContactDataManager->FavLinkLC( i );
+if ( found )
-CreateListBoxContactStringL( *favContactString, link, matchThumbnails, ETrue );
+{
-CleanupStack::PopAndDestroy(); //link
+// matches, add this fav to listbox.
-}
+CreateListBoxContactStringL( *favContactString, link, matchThumbnails, ETrue );
-CleanupStack::PopAndDestroy( favContactString );
+}
-}
+CleanupStack::PopAndDestroy(); // link
-iNumberOfNames = iListBoxModel->Count();
+CleanupStack::PopAndDestroy( favContactString );
+}
+CleanupStack::PopAndDestroy( &favsFoundByPcs ); // ResetAndDestroy
+// Update the view
+// ---------------
+iNumberOfNames = iListBoxModel->Count();
+if ( iNumberOfNames )
+{
 iContactListBox->SetRectToNumberOfItems( iNumberOfNames );
 iContactListBox->HandleItemAdditionL();
 // Scroll the list to bottom
 iContactListBox->ScrollToMakeItemVisible( iNumberOfNames-1 );
 iContactListBox->MakeVisible( ETrue );
 }
 else
 {
-iNumberOfNames = 0;
 iContactListBox->MakeVisible( EFalse );
 }
 if ( IsFocused() )
 {
 TBool videoCall = EFalse;
 TBool message = EFalse;
 if ( iContactListBox->CurrentItemIndex() >= 0 )
 {
 TInt index = iContactListBox->CurrentContactDataIndex();
 voiceCall = iContactDataManager->VoiceCallAvailable( index );
 videoCall = iContactDataManager->VideoCallAvailable( index );
 message = iContactDataManager->UniEditorAvailable( index );
 }
 }
 TBool ret(EFalse);
-switch( aCommand )
+switch ( aCommand )
 {
 case EEasyDialingOpenContact:
 iRememberFocus = ETrue;
 AsyncActionLaunchL( ELaunchCurrentContact );
 // -----------------------------------------------------------------------------
 // IsEnabled
 // Check if Easy dialing is enabled in the settings
 // -----------------------------------------------------------------------------
 //
-TBool CEasyDialingPlugin::IsEnabled()
+TBool CEasyDialingPlugin::IsEnabled() const
 {
-return ( iCenrepListener->Value() != 0 );
+return ( iCenrepListener && iCenrepListener->Value() != 0 );
 }
 // -----------------------------------------------------------------------------
 // AsyncActionLaunchL
 // Use asynchronous callback to launch action. While action is being launched,
 iInputBlocker = CAknInputBlock::NewCancelHandlerLC( this );
 CleanupStack::Pop( iInputBlocker );
 // This means that iInputBlocker is deleted by CAknInputBlock when
 // it's cancelled ( we get a callback where iInputBlocker is set to NULL).
 iInputBlocker->SetCancelDelete( iInputBlocker );
 }
 // -----------------------------------------------------------------------------
 // AsyncCallBackToLaunchAction
 // Callback function for CAsyncCallBack class.
 // Remove highlight separators. It is possible that some contactor API has problem with them.
 HBufC* fullName = AllocWithoutHighlightSeparatorsLC( fullNameSeparators );
 VPbkFieldTypeSelectorFactory::TVPbkContactActionTypeSelector selector(
 VPbkFieldTypeSelectorFactory::EEmptySelector );
 switch ( iActionToBeLaunched )
 {
 case ECallCurrentContact:
 {
 else
 {
 selector = VPbkFieldTypeSelectorFactory::EVoiceCallSelector;
 }
 CleanupStack::PopAndDestroy( sPSettings );
 }
 break;
 case EVideoCallCurrentContact:
 AsyncActionLaunchL( ECallCurrentContact );
 break;
 case KEasyDialingContactLongTapped:
 AsyncActionLaunchL( ELaunchCurrentContact );
+break;
+// Pause contact data manager when panning and flicking listbox.
+// This ensures smooth and responsive listbox touch handling.
+case EEventFlickStarted:
+case EEventPanningStarted:
+iContactDataManager->Pause( ETrue );
+break;
+case EEventFlickStopped:
+case EEventPanningStopped:
+iContactDataManager->Pause( EFalse );
 break;
 // We are not interested about the other listbox events.
 default:
 break;
 aChar == TChar('#') ||
 aChar == TChar('*') ||
 aChar == TChar('+');
 }
+// -----------------------------------------------------------------------------
+// Find contact link pointing to the same contact as given link
+// -----------------------------------------------------------------------------
+//
+static TInt Find( const MVPbkContactLink* aLink, const RPointerArray<MVPbkContactLink>& aArray )
+{
+TInt idx = KErrNotFound;
+for ( TInt i = 0 ; i < aArray.Count() ; ++i )
+{
+if ( aArray[i]->IsSame( *aLink ) )
+{
+idx = i;
+i = aArray.Count();
+}
+}
+return idx;
+}
+// -----------------------------------------------------------------------------
+// CleanupStack helpers for item owning RPointerArrays (etc)
+// -----------------------------------------------------------------------------
+//
+template <class T>
+class CleanupResetAndDestroy
+{
+public:
+inline static void PushL( T& aRef )
+{ CleanupStack::PushL( TCleanupItem(&ResetAndDestroy,&aRef) ); }
+private:
+inline static void ResetAndDestroy( TAny *aPtr )
+{ static_cast<T*>(aPtr)->ResetAndDestroy(); }
+};
+template <class T>
+inline void CleanupResetAndDestroyPushL( T& aRef )
+{ CleanupResetAndDestroy<T>::PushL(aRef); }
 //  End of File

branch	RCL_3
changeset 15	2a26698d78ba
parent 14	24062c24fe38
child 17	38529f706030