FCL/sf/app/commonemail: comparison emailuis/nmailuiengine/src/nmuiengine.cpp

equal deleted inserted replaced

-:64e38f08e49c
+:47d84de1c893
 mSendOperation(NULL),
 mRemoveDraftOperation(NULL),
 mSaveDraftOperation(NULL),
 mDraftMessage(NULL)
 {
-NM_FUNCTION;
 mPluginFactory = NmDataPluginFactory::instance();
 mDataManager = new NmDataManager();
 // Connect to the plugins to receive change notifications
 QList<QObject*> *dataPlugins = mPluginFactory->pluginInstances();
 for (int i(0); i < dataPlugins->count(); i++) {
 /*!
 Class destructor.
 */
 NmUiEngine::~NmUiEngine()
 {
-NM_FUNCTION;
 enableSyncIndicator(false);
 if (mMessageSearchListModel) {
 delete mMessageSearchListModel;
 mMessageSearchListModel = NULL;
 /*!
 */
 NmUiEngine *NmUiEngine::instance()
 {
-NM_FUNCTION;
 if (!mInstance) {
 	mInstance = new NmUiEngine();
 }
 mReferenceCount++;
 return mInstance;
 /*!
 */
 void NmUiEngine::releaseInstance(NmUiEngine *&instance)
 {
-NM_FUNCTION;
 //can't have passed out instances if we don't have any
 if (mInstance) {
 if(instance == mInstance) {
 instance = NULL;
 mReferenceCount--;
 Returns a list model populated with the mailbox and top level folder objects. The model is
 updated dynamically. The ownership of the model object is not moved to the caller.
 */
 NmMailboxListModel &NmUiEngine::mailboxListModel()
 {
-NM_FUNCTION;
 if (!mMailboxListModel) {
 refreshMailboxListModel(); // creates the model too
 }
 return *mMailboxListModel;
 Populate the list model with the mailbox and top level folder objects. The model is
 updated dynamically. Creates the model if needed.
 */
 void NmUiEngine::refreshMailboxListModel()
 {
-NM_FUNCTION;
 if (!mMailboxListModel) {
 mMailboxListModel = new NmMailboxListModel(*mDataManager);
 // Connect the model to the plugins to receive change notifications
 QList<QObject*> *dataPlugins = mPluginFactory->pluginInstances();
 object is not moved to the caller.
 */
 NmMessageListModel &NmUiEngine::messageListModel(const NmId &mailboxId,
 const NmId &folderId)
 {
-NM_FUNCTION;
 QObject *plugin = mPluginFactory->pluginInstance(mailboxId);
 bool isInbox(false);
 if (standardFolderId(mailboxId,NmFolderInbox)==folderId){
 isInbox=true;
 }
 const NmId &, const QList<NmId> &, const NmId&)), Qt::UniqueConnection );
 // Create inbox list model only once when entering to inbox for the first time
 // or re-create inbox list model when mailbox has changed
 if ((!mInboxListModel&&isInbox)||
 (mInboxListModel&&isInbox&&mailboxId!=mInboxListModel->currentMailboxId())){
-// Delete previous model and set to NULL. Deleting model will also
+createMessageListModel(&mInboxListModel, mailboxId, folderId);
-// delete all items in model.
-if (mInboxListModel){
-delete mInboxListModel;
-mInboxListModel=NULL;
-}
-// Create new inbox model
-mInboxListModel = new NmMessageListModel(*mDataManager);
-// Initial fill up of inbox list model, otherwise updated in the background
-QList<NmMessageEnvelope*> messageEnvelopeList;
-mDataManager->listMessages(mailboxId, folderId, messageEnvelopeList);
-mInboxListModel->refresh(mailboxId, folderId, messageEnvelopeList);
-while (!messageEnvelopeList.isEmpty()) {
-delete messageEnvelopeList.takeFirst();
-}
 }
 // Selected folder is not inbox folder for the mailbox
 else if (!isInbox){
 // Recreate model for other folders when needed, previous model
 // items are deleted from the memory with the old model
-if (mMessageListModel){
+createMessageListModel(&mMessageListModel, mailboxId, folderId);
-delete mMessageListModel;
-mMessageListModel=NULL;
-}
-mMessageListModel = new NmMessageListModel(*mDataManager);
-// Fill up other model
-QList<NmMessageEnvelope*> messageEnvelopeList;
-mDataManager->listMessages(mailboxId, folderId, messageEnvelopeList);
-mMessageListModel->refresh(mailboxId, folderId, messageEnvelopeList);
-while (!messageEnvelopeList.isEmpty()) {
-delete messageEnvelopeList.takeFirst();
-}
 }
 }
 // Connect sync state changed
 if (plugin){
 \return A message list model.
 */
 NmMessageListModel &NmUiEngine::messageListModelForSearch(const NmId &mailboxId)
 {
-NM_FUNCTION;
 Q_UNUSED(mailboxId);
 if (!mMessageSearchListModel) {
 mMessageSearchListModel = new NmMessageListModel(*mDataManager);
 mMessageSearchListModel->setIgnoreFolderIds(true);
 */
 NmId NmUiEngine::standardFolderId(
 const NmId &mailboxId,
 NmFolderType folderType)
 {
-NM_FUNCTION;
 NmId value;
 if (folderType != NmFolderOther) {
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if(plugin) {
 */
 NmMessage *NmUiEngine::message(const NmId &mailboxId,
 const NmId &folderId,
 const NmId &messageId)
 {
-NM_FUNCTION;
 NmMessage *message = mDataManager->message(mailboxId, folderId, messageId);
 return message;
 }
 /*!
 */
 QPointer<NmOperation> NmUiEngine::fetchMessage( const NmId &mailboxId,
 const NmId &folderId,
 const NmId &messageId )
 {
-NM_FUNCTION;
 QPointer<NmOperation> value(NULL);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 value = plugin->fetchMessage(mailboxId, folderId, messageId);
 const NmId &mailboxId,
 const NmId &folderId,
 const NmId &messageId,
 const NmId &messagePartId)
 {
-NM_FUNCTION;
 QPointer<NmOperation> value(NULL);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 value = plugin->fetchMessagePart(mailboxId, folderId, messageId, messagePartId);
 const NmId &mailboxId,
 const NmId &folderId,
 const NmId &messageId,
 const QList<NmId> &messagePartIds)
 {
-NM_FUNCTION;
 QPointer<NmOperation> value(NULL);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 value = plugin->fetchMessageParts(mailboxId, folderId, messageId, messagePartIds);
 const NmId &mailboxId,
 const NmId &folderId,
 const NmId &messageId,
 const NmId &messagePartId)
 {
-NM_FUNCTION;
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 return plugin->messagePartFile(mailboxId, folderId, messageId, messagePartId);
 }
 const NmId &mailboxId,
 const NmId &folderId,
 const NmId &messageId,
 NmMessagePart &messagePart)
 {
-NM_FUNCTION;
 return mDataManager->contentToMessagePart(mailboxId, folderId, messageId, messagePart);
 }
 /*!
 int NmUiEngine::deleteMessages(const NmId &mailboxId,
 const NmId &folderId,
 const QList<NmId> &messageIdList)
 {
 NM_FUNCTION;
 int result(NmNotFoundError);
 bool isInbox(false);
 if (standardFolderId(mailboxId,NmFolderInbox)==folderId){
 isInbox=true;
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 result = plugin->deleteMessages(mailboxId, folderId, messageIdList);
 }
-	return result;
+// Because the asynchronous delete operation may take some time to
+// finish, we will not wait for the NmMessageDeleted events from the
+// protocol plugin. Instead, handleMessageEvent() is invoked directly.
+// This causes the viewer to exit even though the asychronous delete
+// operation would take a bit longer to finish.
+handleMessageEvent(NmMessageDeleted,folderId,messageIdList,mailboxId);
+return result;
 }
 /*!
 Sets the envelope property for the given envelopes.
 const NmId &mailboxId,
 const NmId &folderId,
 NmEnvelopeProperties property,
 const QList<const NmMessageEnvelope*> &envelopeList)
 {
-NM_FUNCTION;
 QPointer<NmStoreEnvelopesOperation> operation(NULL);
 NmMessageListModel *theMessageListModel = mMessageListModel;
 if (!theMessageListModel) {
 theMessageListModel = &messageListModel(mailboxId, folderId);
 Creates a new message (into Drafts-folder).
 Operation is automatically deleted after completion or cancelling.
 */
 QPointer<NmMessageCreationOperation> NmUiEngine::createNewMessage(const NmId &mailboxId)
 {
-NM_FUNCTION;
 QPointer<NmMessageCreationOperation> value(NULL);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 value = plugin->createNewMessage(mailboxId);
 */
 QPointer<NmMessageCreationOperation> NmUiEngine::createForwardMessage(
 const NmId &mailboxId,
 const NmId &originalMessageId)
 {
-NM_FUNCTION;
 QPointer<NmMessageCreationOperation> value(NULL);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 value = plugin->createForwardMessage(mailboxId, originalMessageId);
 QPointer<NmMessageCreationOperation> NmUiEngine::createReplyMessage(
 const NmId &mailboxId,
 const NmId &originalMessageId,
 bool replyAll)
 {
+QPointer<NmMessageCreationOperation> value(NULL);
+NmDataPluginInterface *plugin =
+mPluginFactory->interfaceInstance(mailboxId);
+if (plugin) {
+value = plugin->createReplyMessage(mailboxId, originalMessageId, replyAll);
+}
+return value;
+}
+/*!
+Saves a message (into message store).
+*/
+int NmUiEngine::saveMessage(const NmMessage &message)
+{
 NM_FUNCTION;
-QPointer<NmMessageCreationOperation> value(NULL);
-NmDataPluginInterface *plugin =
-mPluginFactory->interfaceInstance(mailboxId);
-if (plugin) {
-value = plugin->createReplyMessage(mailboxId, originalMessageId, replyAll);
-}
-return value;
-}
-/*!
-Saves a message (into message store).
-*/
-int NmUiEngine::saveMessage(const NmMessage &message)
-{
-NM_FUNCTION;
 const NmId &mailboxId = message.envelope().mailboxId();
 int ret(NmNotFoundError);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 /*!
 Refreshes mailbox.
 */
 int NmUiEngine::refreshMailbox(const NmId &mailboxId )
 {
-NM_FUNCTION;
 int ret(NmNotFoundError);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 ret = plugin->refreshMailbox(mailboxId);
 /*!
 Online mailbox.
 */
 int NmUiEngine::goOnline(const NmId &mailboxId )
 {
-NM_FUNCTION;
 int ret(NmNotFoundError);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 ret = plugin->goOnline(mailboxId);
 /*!
 Offline mailbox.
 */
 int NmUiEngine::goOffline(const NmId &mailboxId )
 {
-NM_FUNCTION;
 int ret(NmNotFoundError);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 ret = plugin->goOffline(mailboxId);
 const NmId &mailboxId,
 const NmId &folderId,
 const NmId &messageId)
 {
 NM_FUNCTION;
 int result(NmNotFoundError);
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 result = plugin->removeMessage(mailboxId, folderId, messageId);
 Handles draft message deletion after editor has closed, takes ownership of message.
 */
 void NmUiEngine::removeDraftMessage(NmMessage *message)
 {
 NM_FUNCTION;
 if (message) {
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(message->envelope().mailboxId());
 if (plugin) {
 */
 void NmUiEngine::saveDraftMessage(NmMessage *message,
 const QList<NmOperation*> &preliminaryOperations)
 {
 NM_FUNCTION;
 if (message) {
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(message->envelope().mailboxId());
 if (plugin) {
 Sends the given message.
 */
 void NmUiEngine::sendMessage(NmMessage *message, const QList<NmOperation *> &preliminaryOperations)
 {
 NM_FUNCTION;
 //First trigger message storing
 if (message) {
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(message->envelope().mailboxId());
 /*!
 Is sending operation in progress.
 */
 bool NmUiEngine::isSendingMessage() const
 {
-NM_FUNCTION;
 int ret(false);
 if (mSendOperation && mSendOperation->isRunning()) {
 ret = true;
 }
 return ret;
 /*!
 Returns a pointer to the message that is being sent. Returns NULL if not sending.
 */
 const NmMessage *NmUiEngine::messageBeingSent() const
 {
-NM_FUNCTION;
 const NmMessage *message = NULL;
 if (mSendOperation) {
 message = mSendOperation->getMessage();
 }
 */
 QPointer<NmAddAttachmentsOperation> NmUiEngine::addAttachments(
 const NmMessage &message,
 const QList<QString> &fileList)
 {
-NM_FUNCTION;
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(message.envelope().mailboxId());
 QPointer<NmAddAttachmentsOperation> ret(NULL);
 if (plugin) {
 */
 QPointer<NmOperation> NmUiEngine::removeAttachment(
 const NmMessage &message,
 const NmId &attachmentPartId)
 {
-NM_FUNCTION;
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(message.envelope().mailboxId());
 QPointer<NmOperation> ret(NULL);
 if (plugin) {
 /*!
 Returns the current sync state of the mailbox
 */
 NmSyncState NmUiEngine::syncState(const NmId& mailboxId)
 {
-NM_FUNCTION;
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 return plugin->syncState(mailboxId);
 }
 /*!
 Returns the current connection state of the mailbox
 */
 NmConnectState NmUiEngine::connectionState(const NmId& mailboxId)
 {
-NM_FUNCTION;
 NmDataPluginInterface *plugin =
 mPluginFactory->interfaceInstance(mailboxId);
 if (plugin) {
 return plugin->connectionState(mailboxId);
 }
 */
 int NmUiEngine::search(const NmId &mailboxId,
 const QStringList &searchStrings)
 {
 NM_FUNCTION;
 // Get the plugin instance.
 QObject *pluginInstance = mPluginFactory->pluginInstance(mailboxId);
 if (pluginInstance) {
 // Make sure the required signals are connected.
 \return A possible error code.
 */
 int NmUiEngine::cancelSearch(const NmId &mailboxId)
 {
-NM_FUNCTION;
 int retVal(NmNoError);
 // Get the plugin interface.
 NmDataPluginInterface *pluginInterface =
 mPluginFactory->interfaceInstance(mailboxId);
 \param folderId id of the folder
 \return Folder type
 */
 NmFolderType NmUiEngine::folderTypeById(NmId mailboxId, NmId folderId)
 {
-NM_FUNCTION;
 NmFolderType ret(NmFolderInbox);
 if (mDataManager){
 ret = mDataManager->folderTypeById(mailboxId,folderId);
 }
 return ret;
 \param mailboxId Id of active mailbox, 0 if application is closed.
 \param folderId Id of active folder, 0 if application is closed.
 */
 void NmUiEngine::updateActiveFolder(const NmId &mailboxId, const NmId &folderId)
 {
-NM_FUNCTION;
 NmApplicationStateInterface *interface =
 mPluginFactory->applicationStateInterfaceInstance(mailboxId);
 if (interface) {
 interface->updateActiveFolder(mailboxId, folderId);
 }
 /*!
 Handle completed send operation.
 */
 void NmUiEngine::handleCompletedSendOperation()
 {
-NM_FUNCTION;
 emit sendOperationCompleted();
 }
 /*!
 Handle completed remove draft operation.
 */
 void NmUiEngine::handleCompletedRemoveDraftOperation()
 {
-NM_FUNCTION;
 // draft message deletion observing not yet implemented...
 }
 /*!
 Handle completed save draft operation.
 */
 void NmUiEngine::handleCompletedSaveDraftOperation()
 {
-NM_FUNCTION;
 // delete message object since it's not needed anymore
 if(mDraftMessage) {
 delete mDraftMessage;
 mDraftMessage = NULL;
 }
 /*!
 Handles synch operation related events
 */
 void NmUiEngine::handleSyncStateEvent(NmSyncState syncState, const NmOperationCompletionEvent &event)
 {
-NM_FUNCTION;
 if ( syncState == SyncComplete ) {
 // signal for reporting about (sync) operation completion status
 emit operationCompleted(event);
 enableSyncIndicator(false);
 \param enabled true if indicator is enabled, false if disabled
 */
 void NmUiEngine::enableSyncIndicator(bool enabled)
 {
-	NM_FUNCTION;
 HbIndicator indicator;
 if (enabled) {
 indicator.activate(syncIndicatorName, QVariant());
 	}
 else {
 \param mailboxId The mailbox id whose signature is asked.
 	\param signature The reference to the signature string pointer. NULL if no signature.
 */
 int NmUiEngine::getSignature(const NmId &mailboxId, QString *&signature)
 {
-NM_FUNCTION;
 int retVal(NmNoError);
 // Get the plugin interface.
 NmDataPluginInterface *pluginInterface =
 mPluginFactory->interfaceInstance(mailboxId);
 void NmUiEngine::handleMessageEvent(NmMessageEvent event,
 const NmId &folderId,
 const QList<NmId> &messageIds,
 const NmId& mailboxId)
 {
-NM_FUNCTION;
 switch (event) {
 case NmMessageDeleted:
 {
 for (int i(0); i < messageIds.count(); i++) {
 emit messageDeleted(mailboxId, folderId, messageIds[i]);
 Currently only NmMailboxDeleted is handled.
 */
 void NmUiEngine::handleMailboxEvent(NmMailboxEvent event,
 const QList<NmId> &mailboxIds)
 {
-NM_FUNCTION;
 switch (event) {
 case NmMailboxDeleted:
 {
 for (int i(0); i < mailboxIds.count(); i++) {
 emit mailboxDeleted(mailboxIds[i]);
 \param mailboxId Id of active mailbox, 0 if application is closed.
 */
 void NmUiEngine::handleFolderEvent(NmFolderEvent event,
 const QList<NmId> &folderIds, const NmId &mailboxId)
 {
-NM_FUNCTION;
 switch (event) {
 case NmFolderIsDeleted:
 handleFolderDeletedEvent(folderIds, mailboxId);
 break;
 case NmFolderIsCreated:
 Handles folder deletion from plugins.
 */
 void NmUiEngine::handleFolderDeletedEvent(const QList<NmId> &folderIds,
 const NmId &mailboxId)
 {
-NM_FUNCTION;
 NmId folderId(0);
 for (int i(0); i < folderIds.count(); i++) {
 folderId = folderIds[i];
 if (mInboxListModel){
 Emits signals based on folder creation from plugins.
 */
 void NmUiEngine::handleFolderCreatedEvent(const QList<NmId> &folderIds,
 const NmId &mailboxId)
 {
-NM_FUNCTION;
 Q_UNUSED(folderIds);
 Q_UNUSED(mailboxId);
 }
 \param messageId The ID of the found message.
 \param folderId The ID of the folder where the message is located.
 */
 void NmUiEngine::handleMatchFound(const NmId &messageId, const NmId &folderId)
 {
-NM_FUNCTION;
 if (!mMessageSearchListModel) {
 // No search list model!
 return;
 }
 void NmUiEngine::messageEventForListModel(NmMessageEvent event,
 const NmId &folderId,
 const QList<NmId> &messageIds,
 const NmId& mailboxId)
 {
-NM_FUNCTION;
 // Forward event to both list models. Models will take care of checking
 // whether event really belongs to current mailbox & folder
 if (mInboxListModel){
 mInboxListModel->handleMessageEvent(event, folderId,
 messageIds, mailboxId);
 /*!
 receives events when going online, and offline.
 */
 void NmUiEngine::handleConnectEvent(NmConnectState connectState, const NmId &mailboxId, const int errorCode)
 {
-NM_FUNCTION;
 // signal for connection state icon handling
 emit connectionEvent(connectState, mailboxId);
 // in case going offline w/ error, emit signal to UI
 if ( connectState == Disconnected && errorCode!= NmNoError ) {
 NmOperationCompletionEvent event={NoOp, errorCode, mailboxId, 0, 0};
 emit operationCompleted(event);
 }
 }
+/*!
+Create message list mode
+*/
+void NmUiEngine::createMessageListModel(
+NmMessageListModel **model,
+const NmId &mailboxId,
+const NmId &folderId)
+{
+// Delete previous model and set to NULL. Deleting model will also
+// delete all items in model.
+if (*model){
+delete *model;
+*model=NULL;
+}
+// Create new list model
+*model = new NmMessageListModel(*mDataManager);
+// Initial fill up of the list model, otherwise updated in the background
+QList<NmMessageEnvelope*> messageEnvelopeList;
+mDataManager->listMessages(mailboxId, folderId, messageEnvelopeList);
+(*model)->refresh(mailboxId, folderId, messageEnvelopeList);
+while (!messageEnvelopeList.isEmpty()) {
+delete messageEnvelopeList.takeFirst();
+}
+}

changeset 75	47d84de1c893
parent 72	64e38f08e49c
child 74	6c59112cfd31