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

equal deleted inserted replaced

-:2a26698d78ba
+:38529f706030
 User::LeaveIfError( cenrep->Get( KEasyDialingContactThumbnails, iContactThumbnailSetting ) );
 CleanupStack::PopAndDestroy( cenrep );
 iPbkSettings = PbkGlobalSettingFactory::CreatePersistentSettingL();
 iPbkSettings->ConnectL( MPbkGlobalSetting::EGeneralSettingCategory );
-/*
-* Phonebook name ordering flag, integer value, possible values:
-* 0: name order Lastname Firstname
-* 1: name order Firstname Lastname
-* 2: name order undefined
-*/
-TInt nameOrderSetting;
-iPbkSettings->Get( MPbkGlobalSetting::ENameOrdering, nameOrderSetting );
-iNameOrder = ( nameOrderSetting == 0 ? ELastnameFirstname : EFirstnameLastname );
 iPbkSettings->RegisterObserverL( this );
+// Get name order from Phonebook settings
+UpdateNameOrderL();
 }
 // ---------------------------------------------------------------------------
 // CEasyDialingContactDataManager::SetObserver
 // ---------------------------------------------------------------------------
 {
 LOGSTRING("CEasyDialingContactDataManager: GetThumbnailAndFav");
 TUint idVal(0);
 TLex lex(aId);
 lex.Val(idVal, EHex);
 TBool retVal;
 CEasyDialingContactData* thumbnail = iContactDataArray[idVal];
 aFav = thumbnail->Fav();
 if (thumbnail->IsLoaded())
 {
 aThumbnail = NULL;
 retVal = EFalse;
 if (iWaitingContacts.Find(idVal) == KErrNotFound)
 {
 LOGSTRING1("iWaitingContacts.Append %d", idVal);
 iWaitingContacts.Append(idVal);
 TRAPD(err, LoadNextContactDataL());
 if (err)
 {
 HandleError(err);
 // CEasyDialingContactDataManager::IsFavL
 // ---------------------------------------------------------------------------
 //
 TBool CEasyDialingContactDataManager::IsFavL( MVPbkContactLink* aLink )
 {
-if ( iFavsView && iFavsView->IndexOfLinkL( *aLink ) > KErrNotFound )
+if ( iFavsView && iFavsViewReady && iFavsView->IndexOfLinkL( *aLink ) > KErrNotFound )
 {
 return ETrue;
 }
 else
 {
 // CEasyDialingContactDataManager::NumberOfFavsL
 // ---------------------------------------------------------------------------
 //
 TInt CEasyDialingContactDataManager::NumberOfFavsL()
 {
-if ( iFavsView )
+if ( iFavsView && iFavsViewReady )
 {
 return iFavsView->ContactCountL();
 }
 else
 {
 // CEasyDialingContactDataManager::FavLinkLC
 // ---------------------------------------------------------------------------
 //
 MVPbkContactLink* CEasyDialingContactDataManager::FavLinkLC( TInt aIndex )
 {
-if ( !iFavsView )
+if ( !iFavsView || !iFavsViewReady )
 {
 // LC function should not return normally unless it has actually
 // put something to cleanup stack
 User::Leave( KErrNotFound );
 }
 //
 void CEasyDialingContactDataManager::SettingChangedL( MPbkGlobalSetting::TPbkGlobalSetting aKey )
 {
 if ( aKey == MPbkGlobalSetting::ENameOrdering )
 {
-TInt nameOrderSetting;
+UpdateNameOrderL();
-iPbkSettings->Get( MPbkGlobalSetting::ENameOrdering, nameOrderSetting );
-iNameOrder = ( nameOrderSetting == 0 ? ELastnameFirstname : EFirstnameLastname );
 if ( iObserver )
 {
 iObserver->NameOrderChanged();
+}
+}
+}
+// ---------------------------------------------------------------------------
+// CEasyDialingContactDataManager::UpdateNameOrderL
+// Update name order according to Phonebook setting
+// ---------------------------------------------------------------------------
+//
+void CEasyDialingContactDataManager::UpdateNameOrderL()
+{
+/*
+* Phonebook name ordering flag, integer value, possible values:
+* 0: name order Lastname Firstname
+* 1: name order Firstname Lastname
+* 2: name order undefined
+*/
+TInt nameOrderSetting;
+iPbkSettings->Get( MPbkGlobalSetting::ENameOrdering, nameOrderSetting );
+switch ( nameOrderSetting )
+{
+case 0:
+{
+iNameOrder = ELastnameFirstname;
+break;
+}
+case 1:
+{
+iNameOrder = EFirstnameLastname;
+break;
+}
+case 2:
+default:
+{
+// Decide name order based on UI language: lastname-firstname
+// for Chinese, firstname-lastname for the rest of languages.
+TLanguage uiLang = User::Language();
+if ( uiLang == ELangPrcChinese ||
+uiLang == ELangHongKongChinese ||
+uiLang == ELangTaiwanChinese )
+{
+iNameOrder = ELastnameFirstname;
+}
+else
+{
+iNameOrder = EFirstnameLastname;
+}
 }
 }
 }
 // ---------------------------------------------------------------------------
 iWaitingContacts.Reset();
 delete iImageOperation;
 iImageOperation = NULL;
 delete iContactOperation;
 iContactOperation = NULL;
-if (iObserver)
+// Also mark all contact data as loaded. Otherwise it would just be
+// loaded again, which would cause infinite loop if there is a permanent
+// problem.
+for ( TInt i = 0; i < iContactDataArray.Count(); i++ )
+{
+iContactDataArray[i]->LoadingComplete();
+}
+if ( iObserver )
 {
 iObserver->AllContactDataLoaded();
 }
 }
 // Continue as if none of the contacts are favourited.
 delete iFavsOperation;
 iFavsOperation = NULL;
 delete iFavsView;
 iFavsView = NULL;
+iFavsViewReady = EFalse;
 InitReady();
 }
 // ---------------------------------------------------------------------------
 {
 delete iFavsOperation;
 iFavsOperation = NULL;
 delete iFavsView;
 iFavsView = aOperationResult;
+iFavsViewReady = ETrue;
+// Leave can be safely ignored. Notifications of favourites view changes
+// will not work, but otherwise Easydialing will work correctly.
+TRAP_IGNORE( iFavsView->AddObserverL( *this ) );
 InitReady();
+}
+// ---------------------------------------------------------------------------
+// CEasyDialingContactDataManager::ContactViewReady
+// From MVPbkContactViewObserver.
+// ---------------------------------------------------------------------------
+//
+void CEasyDialingContactDataManager::ContactViewReady(
+MVPbkContactViewBase& aView )
+{
+LOGSTRING("CEasyDialingContactDataManager: ContactViewReady");
+if ( iFavsView == &aView )
+{
+iFavsViewReady = ETrue;
+}
+}
+// ---------------------------------------------------------------------------
+// CEasyDialingContactDataManager::ContactViewUnavailable
+// From MVPbkContactViewObserver.
+// ---------------------------------------------------------------------------
+//
+void CEasyDialingContactDataManager::ContactViewUnavailable(
+MVPbkContactViewBase& aView )
+{
+LOGSTRING("CEasyDialingContactDataManager: ContactViewUnavailable");
+if ( iFavsView == &aView )
+{
+iFavsViewReady = EFalse;
+}
+}
+// ---------------------------------------------------------------------------
+// CEasyDialingContactDataManager::ContactAddedToView
+// From MVPbkContactViewObserver.
+// ---------------------------------------------------------------------------
+//
+void CEasyDialingContactDataManager::ContactAddedToView(
+MVPbkContactViewBase& aView,
+TInt /*aIndex*/,
+const MVPbkContactLink& /*aContactLink*/ )
+{
+LOGSTRING("CEasyDialingContactDataManager: ContactAddedToView");
+if ( iFavsView == &aView )
+{
+iObserver->FavouritesChanged();
+}
+}
+// ---------------------------------------------------------------------------
+// CEasyDialingContactDataManager::ContactRemovedFromView
+// From MVPbkContactViewObserver.
+// ---------------------------------------------------------------------------
+//
+void CEasyDialingContactDataManager::ContactRemovedFromView(
+MVPbkContactViewBase& aView,
+TInt /*aIndex*/,
+const MVPbkContactLink& /*aContactLink*/ )
+{
+LOGSTRING("CEasyDialingContactDataManager: ContactRemovedFromView");
+if ( iFavsView == &aView )
+{
+iObserver->FavouritesChanged();
+}
+}
+// ---------------------------------------------------------------------------
+// CEasyDialingContactDataManager::ContactViewError
+// From MVPbkContactViewObserver.
+// ---------------------------------------------------------------------------
+//
+void CEasyDialingContactDataManager::ContactViewError(
+MVPbkContactViewBase& aView,
+TInt /*aError*/,
+TBool /*aErrorNotified*/ )
+{
+LOGSTRING("CEasyDialingContactDataManager: ContactViewError");
+if ( iFavsView == &aView )
+{
+iFavsViewReady = EFalse;
+}
 }
 // ---------------------------------------------------------------------------
 // CEasyDialingContactDataManager::DoHandleContactOperationCompleteL
 // ---------------------------------------------------------------------------
 InformObserver();
 }
 }
 else
 {
-// Protective coding. If aContact is NULL, act like opening the contact link failed.
+// Opening contact failed. Mark contact data loaded, so it's not opened again.
 CEasyDialingContactData *tn = iContactDataArray[aIndex];
 tn->LoadingComplete();
 LOGSTRING1("iWaitingContacts.Remove %d", iWaitingContacts[0]);
 iWaitingContacts.Remove(0);
 LoadNextContactDataL();
 // CEasyDialingContactDataManager::VPbkSingleContactOperationFailed
 // ---------------------------------------------------------------------------
 //
 void CEasyDialingContactDataManager::VPbkSingleContactOperationFailed(
 MVPbkContactOperationBase& /*aOperation*/,
-TInt aError )
+TInt /*aError*/ )
 {
 LOGSTRING("CEasyDialingContactDataManager: VPbkSingleContactOperationFailed");
 delete iContactOperation;
 iContactOperation = NULL;
-HandleError(aError);
+TInt index = iWaitingContacts[0];
+LOGSTRING1("VPbkSingleContactOperationFailed, Index=%d", index);
+TRAPD(err, DoHandleContactOperationCompleteL(NULL, index));
+if (err)
+{
+HandleError(err);
+}
 LOGSTRING("CEasyDialingContactDataManager: VPbkSingleContactOperationFailed Exit");
 }
 // ---------------------------------------------------------------------------
 // CEasyDialingContactDataManager::InformObserver
 // CEasyDialingContactDataManager::GetContactThumbnailSetting
 // ---------------------------------------------------------------------------
 //
 TBool CEasyDialingContactDataManager::GetContactThumbnailSetting( )
 {
 return iContactThumbnailSetting;
 }
 // ---------------------------------------------------------------------------
 // CEasyDialingContactDataManager::Reload
 // ---------------------------------------------------------------------------
 //
 void  CEasyDialingContactDataManager::Reload( )
 {
 LOGSTRING("CEasyDialingContactDataManager: Reload");
 for ( TInt i = 0 ; i < iContactDataArray.Count() ; i++ )
 {
 iContactDataArray[ i ]->DeleteThumbnail();
 }
 }
-// TODO: open item: sorting of favourites
 //  End of File

branch	RCL_3
changeset 6	38529f706030
parent 5	2a26698d78ba
child 7	544e34b3255a