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

equal deleted inserted replaced

-:a32b19fb291e
+:5b14749788d7
 // 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 <xqconversions.h>
 // USER INCLUDES
 #include "debugtraces.h"
 #include "msgunieditoraddress.h"
-#include "msgunifiededitorlineedit.h"
+#include "msgunieditorlineedit.h"
-#include "msgmonitor.h"
+#include "msgunieditormonitor.h"
-#include "unieditorgenutils.h"
+#include "UniEditorGenUtils.h"
 const QString PBK_ICON("qtg_mono_contacts");
-const QString SEND_ICON("qtg_mono_send");
+const QString REPLACEMENT_STR("; ");
-const QString replacementStr("; ");
+const QString COMMA_SEPERATOR(",");
 // Constants
 const int KDefaultGsmNumberMatchLength = 7;  //matching unique ph numbers
 #define LOC_SMS_RECIPIENT_LIMIT_REACHED hbTrId("txt_messaging_dialog_number_of_recipients_exceeded")
 #define LOC_MMS_RECIPIENT_LIMIT_REACHED hbTrId("txt_messaging_dpopinfo_unable_to_add_more_recipien")
 #define LOC_DIALOG_OK hbTrId("txt_common_button_ok")
 #define LOC_BUTTON_CANCEL hbTrId("txt_common_button_cancel")
 #define LOC_INVALID_RECIPIENT hbTrId("txt_messaging_dialog_invalid_recipient_found")
+#define LOC_INVALID_RECIPIENT_NOT_ADDED hbTrId("txt_messaging_dialog_invalid_recipient_not_added")
+#define LOC_INVALID_RECIPIENTS_NOT_ADDED hbTrId("txt_messaging_dialog_invalid_recipients_not_added")
 MsgUnifiedEditorAddress::MsgUnifiedEditorAddress( const QString& label,
 QGraphicsItem *parent ) :
 MsgUnifiedEditorBaseWidget(parent),
 mSkipMaxRecipientQuery(false),
 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.
 //style()->unregisterPlugin(mPluginPath);
 }
 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)
 {
 CntServicesContactList contactList =
 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;
 // first, we check if MMS max-recipient count will exceed
 int count = addrlist.count();
-	int futureCount = count + MsgMonitor::msgAddressCount();
+	int futureCount = count + MsgUnifiedEditorMonitor::msgAddressCount();
-	if(futureCount > MsgMonitor::maxMmsRecipients())
+	if(futureCount > MsgUnifiedEditorMonitor::maxMmsRecipients())
 	{
 	    mAboutToExceedMaxMmsRecipients = true;
 	    mExceedsMaxMmsRecipientsBy =
-	            futureCount - MsgMonitor::maxMmsRecipients();
+	            futureCount - MsgUnifiedEditorMonitor::maxMmsRecipients();
 	}
 	// else, check if SMS max-recipient count will exceed
 	else if(!mSkipMaxRecipientQuery)
 	{
 	    futureCount = count + addressCount();
-	    if( (addressCount() <= MsgMonitor::maxSmsRecipients()) &&
+	    if( (addressCount() <= MsgUnifiedEditorMonitor::maxSmsRecipients()) &&
-	        (futureCount > MsgMonitor::maxSmsRecipients()) )
+	        (futureCount > MsgUnifiedEditorMonitor::maxSmsRecipients()) )
 	    {
 	        mAboutToExceedMaxSmsRecipients = true;
 	    }
 	}
+	int  invalidCount= 0;
+QString invalidContacts;
 for(int i = 0; i < count; i++ )
 {
-mAddressMap.insertMulti(addrlist[i]->address(), addrlist[i]->alias());
+bool isValid = false;
-if(!addrlist[i]->alias().isEmpty())
+isValid = checkValidAddress(addrlist.at(i)->address());
-{
+if(!isValid)
-mAddressEdit->setText(addrlist[i]->alias());
+{
-}
+invalidCount ++;
-else
+// append the comma till last but one contact.
-{
+// add the invalid ocntacts to the " , " seperated string.
-mAddressEdit->setText(addrlist[i]->address(), false);
+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())
+{
+mAddressEdit->setText(addrlist[i]->alias());
+}
+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
 mAboutToExceedMaxSmsRecipients = false;
 mAboutToExceedMaxMmsRecipients = false;
 mExceedsMaxMmsRecipientsBy = 0;
 void MsgUnifiedEditorAddress::onContentsChanged(const QString& text)
 {
 // Max MMS recipient count check
 if( mAboutToExceedMaxMmsRecipients ||
-(MsgMonitor::msgAddressCount() >= MsgMonitor::maxMmsRecipients()) )
+(MsgUnifiedEditorMonitor::msgAddressCount() >= MsgUnifiedEditorMonitor::maxMmsRecipients()) )
 {
 if(mAboutToExceedMaxMmsRecipients)
 {// show discreet note only once
 --mExceedsMaxMmsRecipientsBy;
 if(!mExceedsMaxMmsRecipientsBy)
 }
 else
 {
 // update monitor data
 emit contentChanged();
-if(MsgMonitor::msgAddressCount() > MsgMonitor::maxMmsRecipients())
+if(MsgUnifiedEditorMonitor::msgAddressCount() > MsgUnifiedEditorMonitor::maxMmsRecipients())
 {
 HbNotificationDialog::launchDialog(
 LOC_MMS_RECIPIENT_LIMIT_REACHED);
 resetToPrevious();
 // reset monitor data
 return;
 }
 // Max SMS recipient count check
 if( !mSkipMaxRecipientQuery &&
-(MsgMonitor::messageType() == ConvergedMessage::Sms) &&
+(MsgUnifiedEditorMonitor::messageType() == ConvergedMessage::Sms) &&
-(mAddressEdit->addresses().count() > MsgMonitor::maxSmsRecipients()) )
+(mAddressEdit->addresses().count() > MsgUnifiedEditorMonitor::maxSmsRecipients()) )
 {
 // when we show this dialog, we don't want the intermediate states
 // to be signalled to us
 disconnect(mAddressEdit, SIGNAL(contentsChanged(const QString&)),
 this, SLOT(onContentsChanged(const QString&)));
 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;
 }
 }
 }
 // to be signalled to us
 disconnect(mAddressEdit, SIGNAL(contentsChanged(const QString&)),
 this, SLOT(onContentsChanged(const QString&)));
 mAddressEdit->clearContent();
-QStringList list = mPrevBuffer.split(replacementStr,
+QStringList list = mPrevBuffer.split(REPLACEMENT_STR,
 QString::SkipEmptyParts);
 int count = list.count();
 QStringList valList = mAddressMap.values();
 for(int i=0; i<count; 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();
 syncAdditionsToMap();
 // get the list of contacts in address-field
 QStringList fieldAddresses(mAddressEdit->addresses());
-bool allValid = true;
+bool isValid = true;
 foreach(QString addr, fieldAddresses)
 {
 // run address validation only if address is unmapped
 // (i.e. user-inserted)
 if(mAddressMap.contains(addr))
 {
-// 1. perform number validation
+isValid = checkValidAddress(addr);
-allValid = CommonPhoneParser::IsValidPhoneNumber(
+if(!isValid)
-*XQConversions::qStringToS60Desc(addr),
-CommonPhoneParser::ESMSNumber );
-// 2. if number validity fails, then perform email addr validation
-if( !allValid &&
-(MsgMonitor::messageType() == ConvergedMessage::Mms) )
-{ // additional check for MMS only
-allValid = genUtils->IsValidEmailAddress(
-*XQConversions::qStringToS60Desc(addr) );
-}
-if(!allValid)
 {
 mAddressEdit->highlightInvalidString(addr);
 QString invalidAddrStr =
 QString(LOC_INVALID_RECIPIENT).arg(addr);
 HbMessageBox* dlg = new HbMessageBox(invalidAddrStr,
 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(
+*tempAddr,
+CommonPhoneParser::ESMSNumber );
+// 2. if number validity fails, then perform email addr validation
+UniEditorGenUtils* genUtils = new UniEditorGenUtils;
+if(!isValid)
+{ // additional check for MMS only
+isValid = genUtils->IsValidEmailAddress(
+*tempAddr );
+}
 delete genUtils;
-return allValid;
+delete tempAddr;
-}
+return isValid;
+}
 void MsgUnifiedEditorAddress::handleInvalidContactDialog(
 HbAction* act)
 {
 Q_UNUSED(act);
 QTimer::singleShot(250, this, SLOT(setFocus()));
 }
+void MsgUnifiedEditorAddress::unblockSignals()
+{
+mLaunchBtn->blockSignals(false);
+}
 Q_IMPLEMENT_USER_METATYPE(CntServicesContact)
 Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(CntServicesContactList)
 //EOF

branch	GCC_SURGE
changeset 47	5b14749788d7
parent 27	e4592d119491
parent 44	36f374c67aa8