FCL/sf/app/messaging: comparison messagingapp/msgui/conversationview/src/msgconversationview.cpp

equal deleted inserted replaced

-:36f374c67aa8
+:12db4185673b
 #include "unidatamodelplugininterface.h"
 #include "ringbc.h"
 #include "mmsconformancecheck.h"
 #include "msgsettingsview.h"
 #include "msgaudiofetcherview.h"
+#include "unieditorpluginloader.h"
+#include "unieditorplugininterface.h"
 //Item specific menu.
 #define LOC_COMMON_OPEN hbTrId("txt_common_menu_open")
 #define LOC_COMMON_DELETE hbTrId("txt_common_menu_delete")
 #define LOC_COMMON_DOWNLOAD hbTrId("txt_messaging_menu_download")
 #define LOC_COMMON_SEND  hbTrId("txt_common_button_send")
 #define LOC_COMMON_SAVE  hbTrId("txt_common_menu_save")
 #define LOC_DELETE_MESSAGE hbTrId("txt_messaging_dialog_delete_message")
+#define LOC_DELETE_SHARED_MESSAGE hbTrId("txt_messaging_dialog_same_message_exists_in_multip")
 #define LOC_SAVE_TO_CONTACTS hbTrId("txt_messaging_menu_save_to_contacts")
 //main menu
 #define LOC_ATTACH          hbTrId("txt_messaging_opt_attach")
 #define LOC_PHOTO           hbTrId("txt_messaging_opt_attach_sub_photo")
 #define LOC_VCARD           hbTrId("txt_messaging_list_business_card")
 #define LOC_ADD_RECIPIENTS  hbTrId("txt_messaging_opt_add_recipients")
 #define LOC_ADD_SUBJECT     hbTrId("txt_messaging_opt_add_subject")
 #define LOC_MSG_SEND_FAILED hbTrId("txt_messaging_dialog_message_sending_failed")
-#define LOC_DIALOG_SMS_SETTINGS_INCOMPLETE hbTrId("txt_messaging_dialog_sms_settings_incomplete")
+#define LOC_DIALOG_SMS_SETTINGS_INCOMPLETE hbTrId("txt_messaging_dialog_sms_message_centre_does_not_e")
 #define LOC_DIALOG_SAVE_RINGTONE hbTrId("txt_conversations_dialog_save_ringing_tone")
+#define LOC_MMS_RETRIEVAL_FAILED hbTrId("txt_messaging_dialog_mms_retrieval_failed")
 const int INVALID_MSGID = -1;
 const int INVALID_CONVID = -1;
 const int CONTACT_INSERTION_MODE = 1;
 mEditorWidget(NULL),
 mContactCardWidget(contactCardWidget),
 mSendUtil(NULL),
 mVkbHost(NULL),
 mVisibleIndex(),
-mVkbopened(false),
 mModelPopulated(false),
 mViewReady(false)
 {
 //create send utils
 mSendUtil = new MsgSendUtil(this);
 //---------------------------------------------------------------
 // MsgConversationView::longPressed
 // @see header file
 //---------------------------------------------------------------
-void MsgConversationView::longPressed(HbAbstractViewItem* viewItem,
+void MsgConversationView::longPressed(HbAbstractViewItem* viewItem, const QPointF& point)
-const QPointF& point)
+{
-{
+showContextMenu(viewItem,point,HbPopup::TopLeftCorner);
-MsgConversationViewItem* item = qgraphicsitem_cast<
-MsgConversationViewItem *> (viewItem);
-// Show the item-specific menu
-if (this->isVisible())
-{
-//If message is in Sending state or is Scheduled to be sent later,
-//do not allow any operations on the message
-int sendingState = item->modelIndex().data(SendingState).toInt();
-if(sendingState == ConvergedMessage::Scheduled ||
-sendingState == ConvergedMessage::Sending ||
-sendingState == ConvergedMessage::Waiting)
-{
-return;
-}
-// Create new menu
-HbMenu* contextMenu = new HbMenu();
-contextMenu->setAttribute(Qt::WA_DeleteOnClose);
-contextMenu->setPreferredPos(point);
-setContextMenu(item, contextMenu, sendingState);
-contextMenu->show();
-}
 }
 //---------------------------------------------------------------
 // MsgConversationView::setContextMenu
 // @see header
 //---------------------------------------------------------------
 void MsgConversationView::setContextMenu(MsgConversationViewItem* item, HbMenu* contextMenu, int sendingState)
 {
 addOpenItemToContextMenu(item , contextMenu,sendingState);
 addResendItemToContextMenu(item, contextMenu, sendingState);
 addForwardItemToContextMenu(item, contextMenu, sendingState);
 addDownloadItemToContextMenu(item, contextMenu);
+addSaveItemToContextMenu(item , contextMenu,sendingState);
 addDeleteItemToContextMenu(item, contextMenu, sendingState);
-addSaveItemToContextMenu(item , contextMenu,sendingState);
 }
 //---------------------------------------------------------------
 // MsgEditorPrivate::addSaveItemToContextMenu
 }
 if ((messageSubType == ConvergedMessage::VCard) &&
 (direction == ConvergedMessage::Incoming))
 {
 HbAction *contextItem = contextMenu->addAction(LOC_SAVE_TO_CONTACTS);
-connect(contextItem, SIGNAL(triggered()),this, SLOT(openItem()));
+connect(contextItem, SIGNAL(triggered()),this, SLOT(saveVCard()));
 return;
 }
-if( (sendingState == ConvergedMessage::SentState ) ||
+if( (sendingState == ConvergedMessage::SentState &&
+messageSubType != ConvergedMessage::VCard) ||
 (direction == ConvergedMessage::Incoming))
 {
 HbAction *contextItem = contextMenu->addAction(LOC_COMMON_OPEN);
 connect(contextItem, SIGNAL(triggered()),this, SLOT(openItem()));
 }
 void MsgConversationView::addResendItemToContextMenu(MsgConversationViewItem* item, HbMenu* contextMenu, int sendingState)
 {
 Q_UNUSED(item)
 int direction = item->modelIndex().data(Direction).toInt();
+int messageSubType = item->modelIndex().data(MessageSubType).toInt();
-if( (direction == ConvergedMessage::Outgoing)&&
+if( ((direction == ConvergedMessage::Outgoing) &&
+(messageSubType != ConvergedMessage::VCard))&&
 ((sendingState == ConvergedMessage::Resend ) ||
-(sendingState == ConvergedMessage::Suspended )||
 (sendingState == ConvergedMessage::Failed )))
 {
 HbAction *contextItem = contextMenu->addAction(LOC_COMMON_SEND);
 connect(contextItem, SIGNAL(triggered()),this, SLOT(resendMessage()));
 }
 }
 if( ((sendingState == ConvergedMessage::SentState) ||
 (sendingState == ConvergedMessage::Resend) ||
 (sendingState == ConvergedMessage::Failed) ||
+(sendingState == ConvergedMessage::Suspended )||
 (direction == ConvergedMessage::Incoming) ) &&
 canForwardMessage)
 {
 HbAction *contextItem = contextMenu->addAction(LOC_COMMON_FORWARD);
 connect(contextItem, SIGNAL(triggered()),this, SLOT(forwardMessage()));
 // MsgConversationView::contactsFetched
 // @see header file
 //---------------------------------------------------------------
 void MsgConversationView::contactsFetched(const QVariant& value)
 {
-CntServicesContactList contactList =
+//switch to editor.
-qVariantValue<CntServicesContactList>(value);
+QVariantList params;
-	int count = contactList.count();
+params << MsgBaseView::ADD_RECIPIENTS;
-	if(count > 0)
+params << value;
-{
+launchUniEditor(params);
-QVariantList params;
-params << MsgBaseView::ADD_RECIPIENTS;
-params << value;
-launchUniEditor(params);
-}
 }
 //---------------------------------------------------------------
 // MsgConversationView::imagesFetched()
 // @see header file
 if(index.isValid())
 {
 qint32 messageId = index.data(ConvergedMsgId).toLongLong();
 if(!(ConversationsEngine::instance()->resendMessage(messageId)))
 {
-HbMessageBox::warning(LOC_MSG_SEND_FAILED);
+HbMessageBox::warning(LOC_MSG_SEND_FAILED, 0, 0, HbMessageBox::Ok);
 }
 }
 }
 void MsgConversationView::downloadMessage()
 {
 QModelIndex index = mConversationList->currentIndex();
 if(index.isValid())
 {
 qint32 messageId = index.data(ConvergedMsgId).toLongLong();
 if(ConversationsEngine::instance()->downloadMessage(messageId)!=KErrNone)
 {
-HbMessageBox::warning("Message Retrieval Failed!"); //TODO: use logical str name
+HbMessageBox::warning(LOC_MMS_RETRIEVAL_FAILED, 0, 0, HbMessageBox::Ok);
 }
 }
 }
 //---------------------------------------------------------------
 // MsgConversationView::deleteItem()
 // Deletes the message
 //---------------------------------------------------------------
 void MsgConversationView::deleteItem()
 {
-HbMessageBox::question(LOC_DELETE_MESSAGE,this,SLOT(onDialogdeleteMsg(HbAction*)),
+QString str = LOC_DELETE_MESSAGE;
+QModelIndex index = mConversationList->currentIndex();
+if(index.isValid())
+{
+int messageType = index.data(MessageType).toInt();
+int direction = index.data(Direction).toInt();
+if ( direction == ConvergedMessage::Outgoing &&
+messageType == ConvergedMessage::Mms )
+{
+qint32 messageId = index.data(ConvergedMsgId).toLongLong();
+if(isSharedMessage(messageId))
+{
+str = LOC_DELETE_SHARED_MESSAGE;
+}
+}
+}
+HbMessageBox::question(str,this,SLOT(onDialogdeleteMsg(HbAction*)),
 HbMessageBox::Delete | HbMessageBox::Cancel);
 }
 //---------------------------------------------------------------
 // MsgConversationView::openItem()
 //@see header
 //---------------------------------------------------------------
 void MsgConversationView::openItem(const QModelIndex & index)
 {
 // Return if invalid index.
-if (!index.isValid() || mVkbopened)
+if (!index.isValid())
 {
 return;
 }
 int messageType = index.data(MessageType).toInt();
 }
 return;
 }
 else if(ConvergedMessage::VCard == messageSubType)
 {
-QString filepath = index.data(Attachments).toStringList().at(0);
+handleShortTap();
-bool result = MsgContactsUtil::launchVCardViewer(filepath);
-if(result)
-{
-int messageId = index.data(ConvergedMsgId).toInt();
-QList<int> msgIdList;
-if(index.data(UnReadStatus).toInt())
-{
-msgIdList.clear();
-msgIdList << messageId;
-ConversationsEngine::instance()->markMessagesRead(msgIdList);
-}
-}
 return;
 }
 else if(ConvergedMessage::VCal == messageSubType)
 {
 return;
 }
 return;
 }
 else if(ConvergedMessage::MmsNotification == messageType)
 {
 qint32 messageId = index.data(ConvergedMsgId).toLongLong();
 if(!ConversationsEngine::instance()->downloadOperationSupported(messageId))
 {
 int notificationState = index.data(NotificationStatus).toInt();
 if( notificationState == ConvergedMessage::NotifExpired)
 {
 // check whether message is in sending progress, then donot launch viewer.
 int location = index.data(MessageLocation).toInt();
 int sendingState = index.data(SendingState).toInt();
+// For suspended message both short tap and long tap needs to show the same
+// context menu.....
+if(direction == ConvergedMessage::Outgoing
+	&&sendingState == ConvergedMessage::Suspended )
+{
+handleShortTap();
+return;
+}
 //If message is in any other state other than 'Sent'
 //do not open the message
 if(direction == ConvergedMessage::Outgoing
 && sendingState != ConvergedMessage::SentState )
 {
 msgIdList.clear();
 msgIdList << messageId;
 ConversationsEngine::instance()->markMessagesRead(msgIdList);
 }
-qint32 messageProperty = index.data(MessageProperty).toInt();
-bool canForwardMessage  = true;
-if (messageType == ConvergedMessage::Mms){
-canForwardMessage = (messageProperty & EPreviewForward)? true:false;
-}
 //switch view
 QVariantList param;
 param << MsgBaseView::UNIVIEWER;  // target view
 param << MsgBaseView::CV; // source view
 param << contactId;
 param << messageId;
 param << mMessageModel->rowCount();
-if (canForwardMessage == true)
-{
-param << 1;
-}
-else
-	{
-		param << 0;
-	}
 emit switchView(param);
 }
 //---------------------------------------------------------------
 // MsgConversationView::launchUniEditor
 // MsgConversationView::vkbOpened
 // @see header file
 //---------------------------------------------------------------
 void MsgConversationView::vkbOpened()
 {
-mVkbopened = true;
 emit vkbOpened(true);
+scrollToBottom();
 QRectF appRect = mVkbHost->applicationArea();
 qreal spacing = 0.0;
 qreal cardHeight = 0.0;
 if(mContactCardWidget->isVisible())
 cardHeight = mContactCardWidget->rect().height();
 spacing = HbDeviceProfile::profile(this).unitValue();
 }
 this->setMaximumHeight(appRect.height()- cardHeight - spacing);
+mConversationList->adjustSize();
 disconnect(mVkbHost,SIGNAL(keypadOpened()),this,SLOT(vkbOpened()));
+}
+//---------------------------------------------------------------
+// MsgConversationView::vkbClosed
+// @see header file
+//---------------------------------------------------------------
+void MsgConversationView::vkbClosed()
+{
+emit vkbOpened(false);
 scrollToBottom();
-}
-//---------------------------------------------------------------
-// MsgConversationView::vkbClosed
-// @see header file
-//---------------------------------------------------------------
-void MsgConversationView::vkbClosed()
-{
-mVkbopened = false;
-emit vkbOpened(false);
 this->setMaximumHeight(-1);
+mConversationList->adjustSize();
 connect(mVkbHost,SIGNAL(keypadOpened()),this,SLOT(vkbOpened()));
-scrollToBottom();
 }
 //---------------------------------------------------------------
 // MsgConversationView::serviceRequestError
 // @see header file
 {
 HbMessageBox *dlg = qobject_cast<HbMessageBox*> (sender());
 if (action == dlg->actions().at(0)) {
 downloadMessage();
 }
+//if message unread, mark as read now
+QModelIndex index = mConversationList->currentIndex();
+qint32 messageId = index.data(ConvergedMsgId).toLongLong();
+QList<int> msgIdList;
+if(index.data(UnReadStatus).toInt())
+{
+msgIdList.clear();
+msgIdList << messageId;
+ConversationsEngine::instance()->markMessagesRead(msgIdList);
+}
 }
 //---------------------------------------------------------------
 // MsgConversationView::onDialogSaveTone
 // @see header file
 disconnect(mainWindow(), SIGNAL(aboutToChangeOrientation()), mConversationList, 0);
 disconnect(mainWindow(), SIGNAL(orientationChanged(Qt: rientation)), mConversationList, 0);
 fetchMoreConversations();
 }
+//---------------------------------------------------------------
+// MsgConversationView::handleShortTap
+// @see header file
+//---------------------------------------------------------------
+void MsgConversationView::handleShortTap()
+{
+HbAbstractViewItem* item = mConversationList->currentViewItem();
+QRectF rc = item->rect();
+QPointF p = item->mapToScene(rc.center());
+showContextMenu(item,p,HbPopup::TopEdgeCenter);
+}
+//---------------------------------------------------------------
+// MsgConversationView::handleShortTap
+// @see header file
+//---------------------------------------------------------------
+void MsgConversationView::showContextMenu(HbAbstractViewItem* viewItem,const QPointF& point, int placement)
+{
+MsgConversationViewItem* item = qgraphicsitem_cast<MsgConversationViewItem *>(viewItem);
+// Show the item-specific menu
+if (this->isVisible())
+{
+//If message is in Sending state or is Scheduled to be sent later,
+//do not allow any operations on the message
+int sendingState = item->modelIndex().data(SendingState).toInt();
+if(sendingState == ConvergedMessage::Scheduled ||
+sendingState == ConvergedMessage::Sending ||
+sendingState == ConvergedMessage::Waiting)
+{
+return;
+}
+// Create new menu
+HbMenu* contextMenu = new HbMenu();
+contextMenu->setAttribute(Qt::WA_DeleteOnClose);
+contextMenu->setPreferredPos(point,HbPopup::Placement(placement));
+setContextMenu(item, contextMenu, sendingState);
+contextMenu->show();
+}
+}
+//---------------------------------------------------------------
+// MsgConversationView::saveVCard
+// @see header file
+//---------------------------------------------------------------
+void MsgConversationView::saveVCard()
+{
+QModelIndex index = mConversationList->currentIndex();
+QString filepath = index.data(Attachments).toStringList().at(0);
+bool result = MsgContactsUtil::launchVCardViewer(filepath);
+if(result)
+{
+int messageId = index.data(ConvergedMsgId).toInt();
+QList<int> msgIdList;
+if(index.data(UnReadStatus).toInt())
+{
+msgIdList.clear();
+msgIdList << messageId;
+ConversationsEngine::instance()->markMessagesRead(msgIdList);
+}
+}
+}
+//---------------------------------------------------------------
+// MsgConversationView::isSharedMessage
+// @see header file
+//---------------------------------------------------------------
+bool MsgConversationView::isSharedMessage(qint32 messageId)
+{
+bool shared = false;
+UniDataModelLoader* pluginLoader = new UniDataModelLoader();
+UniDataModelPluginInterface* pluginInterface =
+pluginLoader->getDataModelPlugin(ConvergedMessage::Mms);
+CMsvSession* session = pluginInterface->session();
+TMsvEntry entry;
+TMsvId service;
+session->GetEntry(messageId, service, entry);
+if(entry.MultipleRecipients())
+{
+shared = true;
+}
+delete pluginLoader;
+return shared;
+}
 // EOF

changeset 52	12db4185673b
parent 44	36f374c67aa8
child 70	a15d9966050f