FCL/sf/app/commonemail: comparison emailuis/nmailui/src/nmsendserviceinterface.cpp

equal deleted inserted replaced

-:459da34cdb45
+:83cc6bae1de8
 */
 //  INCLUDES
 #include "nmuiheaders.h"
 /*!
 \class NmStartParamDataHelper
 \brief A helper class for processing the data given to the actual service.
 */
 class NmStartParamDataHelper
 /*!
 Class constructor.
 */
 inline NmStartParamDataHelper()
-: mSubject(0),
+: mSubject(NULL),
-mToAddresses(0),
+mToAddresses(NULL),
-mCcAddresses(0),
+mCcAddresses(NULL),
-mBccAddresses(0),
+mBccAddresses(NULL),
-mAttachmentList(0),
+mAttachmentList(NULL),
-mEditorStartMode(NmUiEditorCreateNew)
+mEditorStartMode(NmUiEditorCreateNew),
+	  mBodyText(NULL),
+	  mMimeType(NULL)
 {
 NM_FUNCTION;
 }
 /*!
 \return True if success, false otherwise.
 */
 inline bool extractData(const QVariant &data)
 {
 NM_FUNCTION;
 bool success(false);
 if (data.canConvert(QVariant::Map)) {
 // The given data may contain a mail subject and recipient lists.
 QMap<QString, QVariant> map = data.toMap();
 take ownership of the members.
 */
 inline void deleteData()
 {
 NM_FUNCTION;
 delete mSubject;
-mSubject = 0;
+mSubject = NULL;
 if (mToAddresses) {
 qDeleteAll(*mToAddresses);
 delete mToAddresses;
-mToAddresses = 0;
+mToAddresses = NULL;
 }
 if (mCcAddresses) {
 qDeleteAll(*mCcAddresses);
 delete mCcAddresses;
-mCcAddresses = 0;
+mCcAddresses = NULL;
 }
 if (mBccAddresses) {
 qDeleteAll(*mBccAddresses);
 delete mBccAddresses;
-mBccAddresses = 0;
+mBccAddresses = NULL;
 }
 delete mAttachmentList;
-mAttachmentList = 0;
+mAttachmentList = NULL;
+delete mBodyText;
+mBodyText = NULL;
+		delete mMimeType;
+		mMimeType = NULL;
 }
 private:
 \return True if success, false otherwise.
 */
 inline bool processMap(const QMap<QString, QVariant> &map)
 {
 NM_FUNCTION;
 QMap<QString, QVariant>::const_iterator i = map.constBegin();
 QString key;
 QVariant value;
 while (i != map.constEnd()) {
 }
 else if (!key.compare(emailSendBccKey, Qt::CaseInsensitive)) {
 // Extract the "bcc" recipients.
 addAddressesToList(value, &mBccAddresses);
 }
+else if (!key.compare(emailSendBodyTextKey, Qt::CaseInsensitive)) {
+// Make sure only the last bodytext is used
+delete mBodyText;
+mBodyText = NULL;
+// Extract the "body" text
+mBodyText = new QString(value.toString());
+}
+else if (!key.compare(emailSendAttachmentKey, Qt::CaseInsensitive)) {
+// Extract the "attachment" part
+if(!mAttachmentList) {
+				    mAttachmentList = new QStringList();
+				}
+				mAttachmentList->append(value.toStringList());
+}
+else if (!key.compare(emailSendBodyMimeTypeKey, Qt::CaseInsensitive)) {
+			    delete mMimeType;
+				mMimeType = NULL;
+// Extract the "mime type" part
+				mMimeType = new QString(value.toString());
+}
 ++i;
 }
 // In principle it is ok even if the map does not contain any data e.g.
 */
 inline void addAddressesToList(const QVariant &addresses,
 QList<NmAddress*> **list)
 {
 NM_FUNCTION;
 if (!list) {
 // Invalid argument!
 return;
 }
 QList<NmAddress*> foundAddresses;
 switch (dataType) {
 case QVariant::String: {
 // A single address.
-NmAddress *address = new NmAddress(addresses.toString());
+NmAddress *address = NmUtilities::qstringToNmAddress(addresses.toString());
 foundAddresses.append(address);
 break;
 }
 case QVariant::StringList: {
 // A list of addresses.
 QStringList addressList = addresses.toStringList();
 foreach (QString addressAsString, addressList) {
-NmAddress *address = new NmAddress(addressAsString);
+NmAddress *address = NmUtilities::qstringToNmAddress(addressAsString);
 foundAddresses.append(address);
 }
 break;
 }
 QList<NmAddress*> *mToAddresses; // Not owned.
 QList<NmAddress*> *mCcAddresses; // Not owned.
 QList<NmAddress*> *mBccAddresses; // Not owned.
 QStringList *mAttachmentList; // Not owned.
 NmUiEditorStartMode mEditorStartMode;
+QString *mBodyText;
+QString *mMimeType;
 };
 /*!
 Class desctructor.
 */
 NmSendServiceInterface::~NmSendServiceInterface()
 {
 NM_FUNCTION;
 delete mStartParam;
 delete mSelectionDialog;
 }
 \return True if a mailbox was selected, false otherwise.
 */
 void NmSendServiceInterface::selectionDialogClosed(NmId &mailboxId)
 {
 NM_FUNCTION;
 if (mailboxId.id()) { // mailbox selected
 launchEditorView(mailboxId);
 }
 else {
 cancelService();
 subject and recipient data.
 */
 void NmSendServiceInterface::send(QVariant data)
 {
 NM_FUNCTION;
 HbMainWindow *mainWindow(NULL);
 // Make sure that qmail stays background if user presses back in editorview
 if (mApplication) {
 mApplication->updateVisibilityState();
 mainWindow = mApplication->mainWindow();
 mCurrentView = mainWindow->currentView();
 // Hide the current view.
 if (mCurrentView) {
 mCurrentView->hide();
 }
 }
 // Check the given data.
 NmStartParamDataHelper dataHelper;
 bool validData = dataHelper.extractData(data);
 	        dataHelper.mToAddresses, // address list
 	    dataHelper.mAttachmentList, // attachment list
 	true, // start as service
 	        dataHelper.mSubject, // message subject
 	        dataHelper.mCcAddresses, // list containing cc recipient addresses
-	    dataHelper.mBccAddresses // list containing bcc recipient addresses
+	    dataHelper.mBccAddresses, // list containing bcc recipient addresses
+	    dataHelper.mBodyText, // body text
+	    dataHelper.mMimeType // body text mime type
 	    );
 if (count == 1) {
 // A single mailbox exists.
 QModelIndex modelIndex = mailboxListModel.index(0, 0);
 }
 if (!XQServiceUtil::isEmbedded()) {
 XQServiceUtil::toBackground(false);
 }
 connect(mSelectionDialog, SIGNAL(selectionDialogClosed(NmId&)),
 this, SLOT(selectionDialogClosed(NmId&)));
 mSelectionDialog->open();
 // launch the editor when the dialog is closed
 */
 void NmSendServiceInterface::launchEditorView(NmId mailboxId)
 {
 NM_FUNCTION;
 NM_COMMENT(QString("NmSendServiceInterface::launchEditorView(): mailboxId=%1").arg(mailboxId.id()));
 // Make the previous view visible again.
 if (mCurrentView) {
 mCurrentView->show();
 mCurrentView = NULL;
 }
 if (mStartParam) {
 // Make sure the NMail application is in the foreground
 if (!XQServiceUtil::isEmbedded()) {
 XQServiceUtil::toBackground(false);
 }
 mStartParam->setMailboxId(mailboxId);
 mApplication->enterNmUiView(mStartParam);
 mStartParam = NULL; // ownership passed
 }
 completeRequest(mAsyncReqId, 1);
 }
 void NmSendServiceInterface::cancelService()
 {
 NM_FUNCTION;
 delete mStartParam;
 mStartParam = NULL;
 // If the service was started as embedded, do not hide the app.
 if (!XQServiceUtil::isEmbedded()) {

changeset 68	83cc6bae1de8
parent 62	a8c646b56683