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

equal deleted inserted replaced

-:011f79704660
+:cdd802add233
 mCcAddresses(0),
 mBccAddresses(0),
 mAttachmentList(0),
 mEditorStartMode(NmUiEditorCreateNew)
 {
+NM_FUNCTION;
 }
 /*!
 Class destructor.
 */
 inline ~NmStartParamDataHelper()
 {
+NM_FUNCTION;
 }
 /*!
 Extracts the data from the given QVariant into the class members.
 \param data QVariant containing the data.
 \return True if success, false otherwise.
 */
 inline bool extractData(const QVariant &data)
 {
-QVariant::Type dataType = data.type();
+NM_FUNCTION;
-bool success = false;
+bool success(false);
-switch (dataType) {
-case QVariant::String: {
+if (data.canConvert(QVariant::Map)) {
-// The given data contains a single attachment.
+// The given data may contain a mail subject and recipient lists.
-QString attachment = data.toString();
+QMap<QString, QVariant> map = data.toMap();
-mAttachmentList = new QStringList(attachment);
+success = processMap(map);
-success = true;
+}
-break;
+else if (data.canConvert(QVariant::StringList)) {
-}
+QStringList attachmentList = data.toStringList();
-case QVariant::StringList: {
+mAttachmentList = new QStringList(attachmentList);
-// The given data contains a list of attachments.
+success = true;
-QStringList attachmentList = data.toStringList();
+}
-mAttachmentList = new QStringList(attachmentList);
+else {
-success = true;
+// Data type not supported!
-break;
+NM_ERROR(1,"NmStartParamDataHelper::extractData(): data type not supported");
 }
-case QVariant::Map: {
-// The given data may contain a mail subject and recipient lists.
-QMap<QString, QVariant> map = data.toMap();
-success = processMap(map);
-break;
-}
-default: {
-// Data type not supported!
-NMLOG("NmStartParamDataHelper::extractData(): Data type not supported!");
-break;
-}
-} // switch ()
 // Determine the editor start mode.
 if (mToAddresses || mCcAddresses || mBccAddresses) {
 mEditorStartMode = NmUiEditorMailto;
 }
 Deletes the class members. Must be used if NmUiStartParam does not
 take ownership of the members.
 */
 inline void deleteData()
 {
+NM_FUNCTION;
 delete mSubject;
 mSubject = 0;
 if (mToAddresses) {
 qDeleteAll(*mToAddresses);
 \param map The map to extract the data from.
 \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()) {
 \param list The list where the addresses are appended to.
 */
 inline void addAddressesToList(const QVariant &addresses,
 QList<NmAddress*> **list)
 {
+NM_FUNCTION;
 if (!list) {
 // Invalid argument!
 return;
 }
 */
 NmSendServiceInterface::NmSendServiceInterface(QString interfaceName,
 QObject *parent,
 NmUiEngine &uiEngine,
 NmApplication *application)
-#ifndef NM_WINS_ENV
 : XQServiceProvider(interfaceName, parent),
-#else
-: QObject(parent),
-#endif
 mApplication(application),
 mUiEngine(uiEngine),
 mAsyncReqId(0),
 mStartParam(NULL),
 mSelectionDialog(NULL),
 mCurrentView(NULL)
 {
-#ifndef NM_WINS_ENV
 publishAll();
-#endif
 }
 /*!
 Class desctructor.
 */
 NmSendServiceInterface::~NmSendServiceInterface()
 {
+NM_FUNCTION;
 delete mStartParam;
 delete mSelectionDialog;
 }
 \param mailboxId Where the ID of the selected mailbox is set.
 \return True if a mailbox was selected, false otherwise.
 */
 void NmSendServiceInterface::selectionDialogClosed(NmId &mailboxId)
 {
-NMLOG("NmSendServiceInterface::selectionDialogClosed");
+NM_FUNCTION;
 if (mailboxId.id()) { // mailbox selected
 launchEditorView(mailboxId);
 }
 else {
 cancelService();
 attach. Can also contain a map with key value pairs containing
 subject and recipient data.
 */
 void NmSendServiceInterface::send(QVariant data)
 {
-NMLOG("NmSendServiceInterface::send()");
+NM_FUNCTION;
-#ifndef NM_WINS_ENV
+HbMainWindow *mainWindow(NULL);
-HbMainWindow *mainWindow = mApplication->mainWindow();
-mCurrentView = mainWindow->currentView();
+// Make sure that qmail stays background if user presses back in editorview
+if (mApplication) {
-// Hide the current view.
+mApplication->updateVisibilityState();
-if (mCurrentView) {
-mCurrentView->hide();
+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);
 NmMailboxListModel &mailboxListModel = mUiEngine.mailboxListModel();
 const int count = mailboxListModel.rowCount();
 NmId mailboxId(0);
 mAsyncReqId = setCurrentRequestAsync();
 if (!validData) {
 // Failed to extract the data!
-NMLOG("NmSendServiceInterface::send(): Failed to process the given data!");
+NM_ERROR(1,"NmSendServiceInterface::send(): failed to process the given data");
 cancelService();
 }
 else if (count == 0) {
-// No mailboxes.
-if (mainWindow) {
-mainWindow->hide();
-}
-// Hide the app if it not embedded
-if (!XQServiceUtil::isEmbedded()) {
-XQServiceUtil::toBackground(true);
-}
 HbDeviceMessageBox note(hbTrId("txt_mail_dialog_no_mailboxes_defined"),
 HbMessageBox::MessageTypeInformation);
 note.setTimeout(HbMessageBox::NoTimeout);
-note.exec();
+note.show();
+cancelService();
+}
+else { // count > 0
 if (mainWindow) {
 mainWindow->show();
 }
-cancelService();
-}
-else { // count > 0
-// Make sure the NMail application is in the foreground.
-XQServiceUtil::toBackground(false);
 	mStartParam = new NmUiStartParam(
 	NmUiViewMessageEditor,
 	        0, // account id
 	        0, // folder id
 else { // count > 1
 if (!mSelectionDialog) {
 mSelectionDialog =
 new NmMailboxSelectionDialog(mUiEngine.mailboxListModel());
 }
-connect(mSelectionDialog,SIGNAL(selectionDialogClosed(NmId&)),
-this,SLOT(selectionDialogClosed(NmId&)));
+connect(mSelectionDialog, SIGNAL(selectionDialogClosed(NmId&)),
+this, SLOT(selectionDialogClosed(NmId&)));
 mSelectionDialog->open();
 // launch the editor when the dialog is closed
 }
 }
 /*!
 Called when mailbox id is know and editor can be opened
 \param mailboxId mailbox using in editor
 */
 void NmSendServiceInterface::launchEditorView(NmId mailboxId)
 {
-NMLOG(QString("NmSendServiceInterface::launchEditorView %1").arg(mailboxId.id()));
+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) {
 mStartParam->setMailboxId(mailboxId);
 mApplication->enterNmUiView(mStartParam);
 mStartParam = NULL; // ownership passed
 }
 completeRequest(mAsyncReqId, 1);
-}
+mAsyncReqId = 0;
+}
-void NmSendServiceInterface::cancelService()
-{
+void NmSendServiceInterface::cancelService()
-NMLOG("NmSendServiceInterface::cancelService");
+{
+NM_FUNCTION;
 delete mStartParam;
 mStartParam = NULL;
 // If the service was started as embedded, do not hide the app.
 if (!XQServiceUtil::isEmbedded()) {
 XQServiceUtil::toBackground(true);
 }
 completeRequest(mAsyncReqId, 0);
+mAsyncReqId = 0;
 // If started as service, the application must be closed now.
 if (XQServiceUtil::isService()) {
 connect(this, SIGNAL(returnValueDelivered()),
 mApplication, SLOT(delayedExitApplication()));
 mCurrentView = NULL;
 }
 }
 }
-#endif /* NM_WINS_ENV */
 // End of file.

branch	GCC_SURGE
changeset 55	cdd802add233
parent 54	997a02608b3a
child 62	a8c646b56683