FCL/sf/app/messaging: comparison messagingapp/msgui/unifiededitor/src/msgunieditoraddress.cpp

equal deleted inserted replaced

-:35b64624a9e7
+:36f374c67aa8
 // INCLUDES
 #include <QTimer>
 #include <HbTextItem>
 #include <HbPushButton>
 #include <HbAction>
-#include <hbinputeditorinterface.h>
 #include <hbmessagebox.h>
 #include <cntservicescontact.h>
 #include <xqaiwrequest.h>
 #include <xqappmgr.h>
 #include <telconfigcrkeys.h>        // KCRUidTelephonyConfiguration
 #include "msgunieditorlineedit.h"
 #include "msgunieditormonitor.h"
 #include "UniEditorGenUtils.h"
 const QString PBK_ICON("qtg_mono_contacts");
-const QString SEND_ICON("qtg_mono_send");
 const QString REPLACEMENT_STR("; ");
 const QString COMMA_SEPERATOR(",");
 // Constants
 const int KDefaultGsmNumberMatchLength = 7;  //matching unique ph numbers
 mAddressEdit->setMaxRows(40);
 connect(mAddressEdit, SIGNAL(contentsChanged(const QString&)),
 this, SLOT(onContentsChanged(const QString&)));
-// add "Send" action in VKB
-HbEditorInterface editorInterface(mAddressEdit);
 mAddressEdit->setInputMethodHints(Qt::ImhPreferNumbers);
-HbAction *sendAction = new HbAction(HbIcon(SEND_ICON), QString(),this);
+}
-connect(sendAction, SIGNAL(triggered()),this, SIGNAL(sendMessage()));
-editorInterface.addAction(sendAction);
-}
 MsgUnifiedEditorAddress::~MsgUnifiedEditorAddress()
 {
 	//TODO: Should remove this code depending on orbit's reply whether it is needed
 	//to unregister the same plugin registered on two different widgets twice.
 }
 void MsgUnifiedEditorAddress::fetchContacts()
 {
 mLaunchBtn->blockSignals(true);
 QList<QVariant> args;
 QString serviceName("com.nokia.services.phonebookservices");
 QString operation("fetch(QString,QString,QString)");
 XQAiwRequest* request;
 XQApplicationManager appManager;
 args << KCntFilterDisplayAll;
 request->setArguments(args);
 request->send();
 delete request;
 //unblock click signal after some delay.
 QTimer::singleShot(250,this,SLOT(unblockSignals()));
 }
 void MsgUnifiedEditorAddress::handleOk(const QVariant& value)
 ConvergedMessageAddressList addrlist;
 for(int i = 0; i < count; i++ )
 {
 ConvergedMessageAddress* address =
 new ConvergedMessageAddress();
-address->setAddress(contactList[i].mPhoneNumber);
+if(!contactList[i].mPhoneNumber.isEmpty())
+{
+address->setAddress(contactList[i].mPhoneNumber);
+}
+else
+{
+address->setAddress(contactList[i].mEmailAddress);
+}
 address->setAlias(contactList[i].mDisplayName);
 addrlist << address;
 }
 setAddresses(addrlist);
 }
 return mAddressEdit->addresses().count();
 }
 void MsgUnifiedEditorAddress::setAddresses(ConvergedMessageAddressList addrlist)
 {
+// avoid processing if no info available
+if(addrlist.count() == 0)
+{
+return;
+}
 // ensure flags are reset before starting the addr addition
 mAboutToExceedMaxSmsRecipients = false;
 mAboutToExceedMaxMmsRecipients = false;
 mExceedsMaxMmsRecipientsBy = 0;
 QString invalidContacts;
 for(int i = 0; i < count; i++ )
 {
 bool isValid = false;
 isValid = checkValidAddress(addrlist.at(i)->address());
 if(!isValid)
 {
 invalidCount ++;
 // append the comma till last but one contact.
 // add the invalid ocntacts to the " , " seperated string.
 if(invalidCount > 1)
 {
 invalidContacts.append(COMMA_SEPERATOR);
 }
 invalidContacts.append(addrlist.at(i)->alias());
 }
 else
 {
 mAddressMap.insertMulti(addrlist[i]->address(), addrlist[i]->alias());
 if(!addrlist[i]->alias().isEmpty())
 {
 else
 {
 mAddressEdit->setText(addrlist[i]->address(), false);
 }
 }
 }
 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("<br>");
 invalidStr.append(invalidContacts);
 HbMessageBox::information(invalidStr);
 }
 // addition operation complete, reset flags
 dlg->setAttribute(Qt::WA_DeleteOnClose);
 dlg->setFocusPolicy(Qt::NoFocus);
 dlg->setTimeout(HbPopup::NoTimeout);
 dlg->setText(LOC_SMS_RECIPIENT_LIMIT_REACHED);
+dlg->clearActions();
 HbAction* okAction = new HbAction(LOC_DIALOG_OK,dlg);
 dlg->addAction(okAction);
 HbAction* cancelAction = new HbAction(LOC_BUTTON_CANCEL,dlg);
 dlg->addAction(cancelAction);
 dlg->open(this,SLOT(onMaxRecipientsReached(HbAction*)));
 // reconnect to get back updates
 connect(mAddressEdit, SIGNAL(contentsChanged(const QString&)),
 this, SLOT(onContentsChanged(const QString&)));
-emit contentChanged();
 }
 void MsgUnifiedEditorAddress::syncDeletionsToMap()
 {
 // get address list from edit-field
 {// if none are present, then delete entry from map
 i = mAddressMap.erase(i);
 }
 else
 {
+// ensure that the matched contact is removed from the
+// address's list
+int matchedIndex = addrList.indexOf(i.value());
+if(matchedIndex == -1)
+{
+matchedIndex = addrList.indexOf(i.key());
+}
+if(matchedIndex != -1)
+{
+addrList.removeAt(matchedIndex);
+}
+// now go to next index in map
 ++i;
 }
 }
 }
 void MsgUnifiedEditorAddress::onMaxRecipientsReached(HbAction* action)
 {
 HbMessageBox *dlg = qobject_cast<HbMessageBox*> (sender());
 if (action == dlg->actions().at(0)) {
 // accept new content, update prev-buffer
+emit contentChanged();
 mPrevBuffer = mAddressEdit->content();
 }
 else {
 // reject the new content, keep the old
 resetToPrevious();
 dlg->open(this, SLOT(handleInvalidContactDialog(HbAction*)));
 break;
 }
 }
 }
 return isValid;
 }
 // ----------------------------------------------------------------------------
 // MsgUnifiedEditorAddress::checkValidAddress
 // @see header
 // ----------------------------------------------------------------------------
 bool MsgUnifiedEditorAddress::checkValidAddress(const QString& addr)
 {
 bool isValid = false;
+HBufC *tempAddr = XQConversions::qStringToS60Desc(addr);
 // 1. perform number validation
 isValid = CommonPhoneParser::IsValidPhoneNumber(
-*XQConversions::qStringToS60Desc(addr),
+*tempAddr,
 CommonPhoneParser::ESMSNumber );
 // 2. if number validity fails, then perform email addr validation
 UniEditorGenUtils* genUtils = new UniEditorGenUtils;
-if( !isValid &&
+if(!isValid)
-( MsgUnifiedEditorMonitor::messageType() == ConvergedMessage::Mms) )
 { // additional check for MMS only
 isValid = genUtils->IsValidEmailAddress(
-*XQConversions::qStringToS60Desc(addr) );
+*tempAddr );
 }
 delete genUtils;
+delete tempAddr;
 return isValid;
 }
 void MsgUnifiedEditorAddress::handleInvalidContactDialog(
 HbAction* act)

changeset 44	36f374c67aa8
parent 34	84197e66a4bd
child 47	5b14749788d7
child 52	12db4185673b