diff -r 8ba0afbb4637 -r a15d9966050f messagingapp/msgui/unifiededitor/src/msgunieditoraddress.cpp --- a/messagingapp/msgui/unifiededitor/src/msgunieditoraddress.cpp Thu Sep 02 20:23:03 2010 +0300 +++ b/messagingapp/msgui/unifiededitor/src/msgunieditoraddress.cpp Fri Sep 17 08:28:39 2010 +0300 @@ -97,12 +97,12 @@ { mLaunchBtn->blockSignals(true); - QList args; - QString serviceName("com.nokia.services.phonebookservices"); - QString operation("fetch(QString,QString,QString)"); + QString service("phonebookservices"); + QString interface("com.nokia.symbian.IContactsFetch"); + QString operation("multiFetch(QString,QString)"); XQAiwRequest* request; XQApplicationManager appManager; - request = appManager.create(serviceName, "Fetch", operation, true); // embedded + request = appManager.create(service, interface, operation, true); // embedded if ( request == NULL ) { return; @@ -112,6 +112,7 @@ connect (request, SIGNAL(requestOk(const QVariant&)), this, SLOT(handleOk(const QVariant&))); connect (request, SIGNAL(requestError(int,const QString&)), this, SLOT(handleError(int,const QString&))); + QList args; args << QString(tr("Phonebook")); args << KCntActionAll; args << KCntFilterDisplayAll; @@ -205,7 +206,7 @@ return mAddressEdit->addresses().count(); } -void MsgUnifiedEditorAddress::setAddresses(ConvergedMessageAddressList addrlist) +void MsgUnifiedEditorAddress::setAddresses(ConvergedMessageAddressList addrlist,bool aSkipCheck) { // avoid processing if no info available if(addrlist.count() == 0) @@ -243,7 +244,15 @@ for(int i = 0; i < count; i++ ) { bool isValid = false; - isValid = checkValidAddress(addrlist.at(i)->address()); + if(!aSkipCheck) + { + isValid = checkValidAddress(addrlist.at(i)->address()); + } + else + { + // no need to validate, assume correct + isValid = true; + } if(!isValid) { invalidCount ++; @@ -253,7 +262,10 @@ { invalidContacts.append(COMMA_SEPERATOR); } - invalidContacts.append(addrlist.at(i)->alias()); + if(addrlist[i]->alias().isEmpty()) + invalidContacts.append(addrlist.at(i)->address()); + else + invalidContacts.append(addrlist.at(i)->alias()); } else { @@ -271,12 +283,10 @@ if(invalidCount) { QString invalidStr; - (invalidCount == 1)?(invalidStr = QString(LOC_INVALID_RECIPIENT_NOT_ADDED)) :(invalidStr = QString(LOC_INVALID_RECIPIENTS_NOT_ADDED)); - // append line seperator - invalidStr.append("
"); - invalidStr.append(invalidContacts); - HbMessageBox::information(invalidStr, 0, 0, HbMessageBox::Ok); - } + (invalidCount == 1)?(invalidStr = QString(LOC_INVALID_RECIPIENT_NOT_ADDED.arg(invalidContacts))) :(invalidStr = QString(LOC_INVALID_RECIPIENTS_NOT_ADDED.arg(invalidContacts))); + HbMessageBox::information(invalidStr, 0, 0, HbMessageBox::Ok); + } + // addition operation complete, reset flags mAboutToExceedMaxSmsRecipients = false;