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

equal deleted inserted replaced

-:94dc1107e8b2
+:40a3f856b14d
 #include <CPsPattern.h>
 #include <CPsRequestHandler.h>
 // Virtual phonebook header files
 #include <VPbkContactStoreUris.h>
-#include <CVPbkContactStoreUriArray.h>
-#include <TVPbkContactStoreUriPtr.h>
-#include <CVPbkContactLinkArray.h>
 #include <VPbkEng.rsg> // contains virtual phonebook data fields
 #include <phoneui.rsg>
 // CCA Launcher header files.
 #include <ccafactory.h>
 // engine and initialises all member data.
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingPlugin::ConstructL()
 {
-// Create a contact store array.
+iLongTapped = EFalse;
-HBufC* defaultCdb = VPbkContactStoreUris::DefaultCntDbUri().AllocLC();
+// Create contact data manager.
-iContactDataStores.AppendL( defaultCdb );
+iContactDataManager = CEasyDialingContactDataManager::NewL();
-CleanupStack::Pop( defaultCdb );
+iContactDataManager->SetObserver( this );
-// Create a contact manager instance.
-iContactStoreUriArray = CVPbkContactStoreUriArray::NewL();
-iContactStoreUriArray->AppendL( TVPbkContactStoreUriPtr( VPbkContactStoreUris::DefaultCntDbUri() ) );
-iContactManager = CVPbkContactManager::NewL( *iContactStoreUriArray );
-iContactDataManager = new (ELeave) CEasyDialingContactDataManager(iContactManager);
-iContactDataManager->ConstructL();
-iContactDataManager->SetObserver(this);
 // Find a handle to ca launcher extension MCCAConnectionExt.
 // Easydialing has to use the extension API, because it needs function CloseAppL
 // only found in extension.
 // MCCAConnection extension has to be obtained through MCCAParameter extension,
 // Cast the pointer into contact launcher object.
 User::LeaveIfNull( any );
 iContactLauncher = static_cast<MCCAConnectionExt*>( any );
-iCenrepListener = CEasyDialingCenrepListener::NewL(this);
+iCenrepListener = CEasyDialingCenrepListener::NewL( this );
 iContactorService = CEDContactorService::NewL( this );
 // EasyDialing resource file is attempted to be read from the same directory where the
 // executed binary is located
 iObservers.Reset();
 delete iCenrepListener;
 delete iContactDataManager;
 delete iPredictiveSearchQuery;
-delete iContactManager;
-delete iContactStoreUriArray;
 iContactDataStores.ResetAndDestroy();
 if ( iPredictiveContactSearchHandler )
 {
 iPredictiveContactSearchHandler->RemoveObserver(this);
 void CEasyDialingPlugin::InitPredictiveContactSearchL()
 {
 iPredictiveContactSearchHandler = CPSRequestHandler::NewL();
 iPredictiveContactSearchHandler->AddObserverL(this);
-// Put the searched contact fields into array.
-RArray<TInt> contact_fields;
-CleanupClosePushL(contact_fields);
 // Check which relevant contact fields are indexed in PCS search.
 iFirstNamePCSIndex = FindContactFieldPCSIndexL( R_VPBK_FIELD_TYPE_FIRSTNAME );
 iLastNamePCSIndex = FindContactFieldPCSIndexL( R_VPBK_FIELD_TYPE_LASTNAME );
 iCompanyNamePCSIndex = FindContactFieldPCSIndexL( R_VPBK_FIELD_TYPE_COMPANYNAME );
 OstTrace0( TRACE_ERROR, CEASYDIALINGPLUGIN_INITPREDICTIVECONTACTSEARCHL_ERROR_NO_LAST_NAME, "ERROR, PCS does not support last name indexing!" );
 LOGSTRING("EasyDialingPlugin: PCS does not support last name indexing => Leave");
 User::Leave( KErrEasyDialingNoLastNamePCSIndexing );
 }
+SetupPcsSettingsL();
+iPredictiveSearchQuery = CPsQuery::NewL();
+}
+// -----------------------------------------------------------------------------
+// SetupPcsSettingsL
+// -----------------------------------------------------------------------------
+//
+void CEasyDialingPlugin::SetupPcsSettingsL()
+{
+// Get current store configuration from Phonebook settings
+iContactDataStores.ResetAndDestroy();
+iContactDataManager->GetCurrentStoreUrisL( iContactDataStores );
+// Put the searched contact fields into array.
+RArray<TInt> contact_fields;
+CleanupClosePushL(contact_fields);
 // First name, last name and company name (if supported) are used in PCS search.
-contact_fields.Append(R_VPBK_FIELD_TYPE_FIRSTNAME);
+contact_fields.Append( R_VPBK_FIELD_TYPE_FIRSTNAME );
-contact_fields.Append(R_VPBK_FIELD_TYPE_LASTNAME);
+contact_fields.Append( R_VPBK_FIELD_TYPE_LASTNAME );
-if ( iCompanyNamePCSIndex != KErrNotFound )
+contact_fields.Append( R_VPBK_FIELD_TYPE_COMPANYNAME );
-{
-contact_fields.Append(R_VPBK_FIELD_TYPE_COMPANYNAME);
+// Create and fill PS settings object.
-}
+CPsSettings* ps_settings = CPsSettings::NewL();
+CleanupStack::PushL( ps_settings );
+ps_settings->SetSearchUrisL( iContactDataStores );
+ps_settings->SetMaxResults( KEDMaximumMatchingContactsCount );
+ps_settings->SetSortType( EAlphabetical );
+ps_settings->SetDisplayFieldsL( contact_fields );
+// Set the PCS settings.
+iPredictiveContactSearchHandler->SetSearchSettingsL( *ps_settings );
+CleanupStack::PopAndDestroy( ps_settings );
+CleanupStack::PopAndDestroy( &contact_fields );
+// Set the sort order. This must happen after the contact store settings
+// are up-to-date.
 SetSortOrderL( iContactDataManager->NameOrder() );
-// Create and fill ps settings object.
-CPsSettings* ps_settings = CPsSettings::NewL();
-CleanupStack::PushL(ps_settings);
-ps_settings->SetSearchUrisL(iContactDataStores);
-ps_settings->SetMaxResults(KEDMaximumMatchingContactsCount);
-ps_settings->SetSortType(EAlphabetical);
-ps_settings->SetDisplayFieldsL(contact_fields);
-// Set the PCS settings.
-iPredictiveContactSearchHandler->SetSearchSettingsL(*ps_settings);
-CleanupStack::PopAndDestroy(ps_settings);
-CleanupStack::PopAndDestroy(&contact_fields);
-iPredictiveSearchQuery = CPsQuery::NewL();
 }
 // -----------------------------------------------------------------------------
 // SetSortOrderL
 // -----------------------------------------------------------------------------
 {
 RArray<TInt> fields;
 CleanupClosePushL( fields );
 if ( aNameOrder == CEasyDialingContactDataManager::EFirstnameLastname )
 {
-fields.Append(R_VPBK_FIELD_TYPE_FIRSTNAME);
+fields.AppendL( R_VPBK_FIELD_TYPE_FIRSTNAME );
-fields.Append(R_VPBK_FIELD_TYPE_LASTNAME);
+fields.AppendL( R_VPBK_FIELD_TYPE_LASTNAME );
 }
 else
 {
-fields.Append(R_VPBK_FIELD_TYPE_LASTNAME);
+fields.AppendL( R_VPBK_FIELD_TYPE_LASTNAME );
-fields.Append(R_VPBK_FIELD_TYPE_FIRSTNAME);
+fields.AppendL( R_VPBK_FIELD_TYPE_FIRSTNAME );
 }
-if ( iCompanyNamePCSIndex != KErrNotFound )
+fields.AppendL( R_VPBK_FIELD_TYPE_COMPANYNAME );
-{
-fields.Append(R_VPBK_FIELD_TYPE_COMPANYNAME);
+// Set the same order for each contact store. PCS automatically ignores
-}
+// fields not supported by the given store.
-iPredictiveContactSearchHandler->ChangeSortOrderL( *iContactDataStores[0], fields );
+for ( TInt i = 0 ; i < iContactDataStores.Count() ; ++i )
+{
+iPredictiveContactSearchHandler->ChangeSortOrderL( *iContactDataStores[i], fields );
+}
 CleanupStack::PopAndDestroy( &fields );
 }
 // -----------------------------------------------------------------------------
 // OfferKeyEventL
 {
 TRAP_IGNORE( DoHandleContactsChangedL() );
 }
 // -----------------------------------------------------------------------------
+// StoreConfigurationChanged
+// From MContactDataManagerObserver
+// -----------------------------------------------------------------------------
+//
+void CEasyDialingPlugin::StoreConfigurationChanged()
+{
+TRAP_IGNORE(
+// Reconfigure PCS to update its store settings
+SetupPcsSettingsL();
+// Contacts available have changed and a new search is needed if we have
+// previous results shown.
+DoHandleContactsChangedL()
+);
+}
+// -----------------------------------------------------------------------------
 // InformContactorEvent
 // From MEDContactorObserver
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingPlugin::InformContactorEvent( MEDContactorObserver::TEvent aEvent )
 // The PCS mode used with character is based on character itself,
 // not to the keyboard it is made with. While this is not strictly
 // identical to checking the used keyboard, this behaves identically
 // in most of the normal cases, and makes the logic simpler.
-if ( IsItuTCharacter( iSearchString[i] ) )
+// In case of hybrid mode keyboard, use always predictive default
+// keyboard.
+if ( iKeyboardMode == EDefaultKeyboard &&
+IsItuTCharacter( iSearchString[i] ) )
 {
 item->SetMode( EPredictiveItuT );
 }
 else
 {
 TInt CEasyDialingPlugin::FindContactFieldPCSIndexL( TInt aIndex )
 {
 RArray<TInt> fieldOrder;
 CleanupClosePushL( fieldOrder );
-// Current implementation searches only from default database.
+// PCS uses the same data plugin for all the Phonebook databases
-// Later this may be expanded to search SIM contacts as well.
+// (i.e. phone contacts, SIM contacts, SDN contacts), and there can be only
+// one data order per plugin. Thus, data order for all databases supported
+// by us is the same, and it's enough to ask data order just for the default CDB.
 const TDesC& defaultCdb = VPbkContactStoreUris::DefaultCntDbUri();
 iPredictiveContactSearchHandler->GetDataOrderL( defaultCdb, fieldOrder );
 TInt pcsIndex = fieldOrder.Find( aIndex );
 for ( TInt i = 0; i < numberOfPCSMatches; i++ )
 {
 TInt indexFromEnd = numberOfPCSMatches - i - 1;
 MVPbkContactLink* link = iPredictiveContactSearchHandler->ConvertToVpbkLinkLC(
-*(aResults[indexFromEnd]), *iContactManager );
+*(aResults[indexFromEnd]), iContactDataManager->ContactManager() );
 if ( !iContactDataManager->IsFavL( link ) )
 {
 // handle favourites separately, in another loop
 HBufC* contactString = CreateContactStringLC( aResults[ indexFromEnd ], nameOrder );
 CreateListBoxContactStringL( *contactString, link, matchThumbnails, EFalse );
 voiceCall = iContactDataManager->VoiceCallAvailable( index );
 videoCall = iContactDataManager->VideoCallAvailable( index );
 message = iContactDataManager->UniEditorAvailable( index );
 }
-// Call menu item is not show if neither voice call nor video call are possible.
-aMenuPane.SetItemDimmed( EEasyDialingVoiceCall, !voiceCall && !videoCall );
+aMenuPane.SetItemDimmed( EEasyDialingVoiceCall, !voiceCall );
+aMenuPane.SetItemDimmed( EEasyDialingVideoCall, !videoCall );
 aMenuPane.SetItemDimmed( EEasyDialingSendMessage, !message );
 LOGSTRING("EasyDialingPlugin::InitializeMenuPaneL: InitializeMenuPaneL done" );
 return ETrue;
 }
-else if ( aMenuResourceId == R_EASYDIALING_OPTIONS_CALL_MENU )
-{
-TBool voiceCall = EFalse;
-TBool videoCall = EFalse;
-if ( iContactListBox->CurrentItemIndex() >= 0 )
-{
-TInt index = iContactListBox->CurrentContactDataIndex();
-voiceCall = iContactDataManager->VoiceCallAvailable( index );
-videoCall = iContactDataManager->VideoCallAvailable( index );
-}
-aMenuPane.SetItemDimmed( EEasyDialingVoiceCall, !voiceCall );
-aMenuPane.SetItemDimmed( EEasyDialingVideoCall, !videoCall );
-LOGSTRING("EasyDialingPlugin::InitializeMenuPaneL: InitializeMenuPaneL for call submenu done" );
-return ETrue;
-}
 else if ( aMenuResourceId == R_EASYDIALING_OPTIONS_ON_OFF_CASCADE_MENU )
 {
 if ( IsEnabled() )
 {
 aMenuPane.SetItemButtonState( EEasyDialingOn, EEikMenuItemSymbolOn );
 // Vkb status flag should be updated always too (invokes no action).
 return ETrue;
 }
-TBool ret(EFalse);
+TBool ret(ETrue);
 switch ( aCommand )
 {
 case EEasyDialingOpenContact:
 iRememberFocus = ETrue;
 AsyncActionLaunchL( ELaunchCurrentContact );
-ret = ETrue;
 break;
 // EEasyDialingEnterKeyAction is sent when Enter key is pressed.
 // EEasyDialingMakeCall is sent when send key or send toolbar button or send menu item is pressed.
 case EEasyDialingVoiceCall: // fall through
 case EEasyDialingEnterKeyAction:
 // Make a call.
 iRememberFocus = ETrue;
 AsyncActionLaunchL( ECallCurrentContact );
-ret = ETrue;
 break;
 // Video call is selectable only through menu.
 case EEasyDialingVideoCall:
 // Make a video call.
 iRememberFocus = ETrue;
 AsyncActionLaunchL( EVideoCallCurrentContact );
-ret = ETrue;
 break;
 // Uni-editor message is selectable only through menu.
 case EEasyDialingSendMessage:
 // Create a message.
 iRememberFocus = ETrue;
 AsyncActionLaunchL( ESendMessageCurrentContact );
-ret = ETrue;
 break;
 // EEasyDialingCallHandlingActivated is sent when the in-call-ui of telephony gets activated
 case EEasyDialingCallHandlingActivated:
 if ( iContactLauncherActive )
 {
 iNewSearchNeeded = EFalse;
 iContactLauncher->CloseAppL();
 }
-ret = ETrue;
 break;
 case EEasyDialingOn:
 iCenrepListener->SetEasyDialingSettingsValue( 1 );
-ret = ETrue;
 break;
 case EEasyDialingOff:
 iCenrepListener->SetEasyDialingSettingsValue( 0 );
-ret = ETrue;
 break;
 case EEasyDialingClosePopup:
 // Not only Number Entry is removed but also closes down number selection popup in case it happens to be open.
 iContactorService->CancelService();
-ret = ETrue;
 break;
 case EEasyDialingVkbOpened:
 iVirtualKeyboardOpen = ETrue;
-ret = ETrue;
 break;
 case EEasyDialingVkbClosed:
 iVirtualKeyboardOpen = EFalse;
-ret = ETrue;
+HandleGainingForeground();
 break;
 default:
+ret = EFalse;
 break;
 }
 return ret;
 }
 // -----------------------------------------------------------------------------
 //
 TBool CEasyDialingPlugin::IsEnabled() const
 {
 return ( iCenrepListener && iCenrepListener->Value() != 0 );
+}
+// -----------------------------------------------------------------------------
+// SetKeyboardMode
+// Sets keyboard mode
+// -----------------------------------------------------------------------------
+//
+void CEasyDialingPlugin::SetKeyboardMode( TKeyboardMode aMode )
+{
+iKeyboardMode = aMode;
 }
 // -----------------------------------------------------------------------------
 // AsyncSimulateKeyEvent
 //
 // -----------------------------------------------------------------------------
 // DoLaunchActionL
 //
 // -----------------------------------------------------------------------------
 //
-void CEasyDialingPlugin::DoLaunchActionL( )
+void CEasyDialingPlugin::DoLaunchActionL()
 {
 if ( iActionToBeLaunched == EInitializePcs )
 {
 PERF_MEASURE_START
 InitPredictiveContactSearchL();
 // 9.2. Selecting contact initiates call
 AsyncActionLaunchL( ECallCurrentContact );
 break;
 case KEasyDialingContactLongTapped:
+iLongTapped = ETrue;
 AsyncActionLaunchL( ELaunchCurrentContact );
 break;
 // Pause contact data manager when panning and flicking listbox.
 // This ensures smooth and responsive listbox touch handling.
 iContactDataManager->Pause( EFalse );
 // Touching the listbox always removes the visual focus from any list item.
 // Move the focus away from the listbox after panning has ended to
 // align our internal state with the visual lack of focus.
-if ( IsFocused() )
+if ( IsFocused() && !iLongTapped )
 {
 SetFocus( EFalse );
 DrawDeferred();
 }
+iLongTapped = EFalse;
 break;
 // We are not interested about the other listbox events.
 default:
 break;
 {
 // The cached information in contact data manager may be outdated. Call to reload makes sure that when the
 // search is made, all data is loaded again.
 iContactDataManager->Reload();
-LaunchSearchL();
+TRAP_IGNORE( LaunchSearchL() );
 }
 }
 // -----------------------------------------------------------------------------
 // HandleLosingForeground
 void CEasyDialingPlugin::DoHandleContactsChangedL()
 {
 if ( iSearchString.Length() > 0 && IsEnabled() )
 {
 CAknAppUi* appUi = static_cast<CAknAppUi*>( iCoeEnv->AppUi() );
-if ( appUi->IsForeground() )
+if ( appUi->IsForeground() && !iVirtualKeyboardOpen )
 {
 // Do new search immediately, if contacts change while we are on the
 // foreground. This can happen for example if view is switched to
 // dialer while deletion of multiple contacts is still ongoing or if
 // PCS takes so long to update the cache that view gets changed

branch	RCL_3
changeset 23	40a3f856b14d
parent 20	3c221667e687