FCL/sf/app/commonemail: comparison emailservices/nmailagent/src/nmmailagent.cpp

equal deleted inserted replaced

-:780f926bc26c
+:f83bd4ae1fe3
 // CONSTS
 const int NmAgentIndicatorNotSet = -1;
 const int NmAgentAlertToneTimer = 60000; // 60s
 const int NmAgentDefaultVibraDuration = 1000; // 1 second
 static const quint32 NmRepositoryId = 0x2002C326;
 static const QString NmMailboxIndicatorType = "com.nokia.nmail.indicatorplugin_%1/1.0";
 static const QString NmSendIndicatorName = "com.nokia.nmail.indicatorplugin.send/1.0";
 static const QString NmUnreadIndicatorName = "com.nokia.nmail.indicatorplugin.unread/1.0";
 if (!mPluginFactory) {
 NM_ERROR(1,"NmMailAgent::init(): PluginFactory not created");
 return false;
 }
-//mSystemTone = new XQSystemToneService();
+mSystemTone = new XQSystemToneService();
 mIndicator = new HbIndicator();
 connect(mIndicator,SIGNAL(userActivated(const QString &, const QVariantMap&)),
 this, SLOT(indicatorActivated(const QString&, const QVariantMap&)));
 QList<QObject*> *plugins = mPluginFactory->pluginInstances();
 NmMailAgent::~NmMailAgent()
 {
 NM_FUNCTION;
 delete mVibra;
-//delete mSystemTone;
+delete mSystemTone;
 qDeleteAll(mMailboxes);
-//delete mSystemTone;
 NmDataPluginFactory::releaseInstance(mPluginFactory);
 }
 /*!
 Initialize the mailbox list with the current state
 NmMailboxInfo *mailboxInfo = getMailboxInfo(mailboxId);
 bool changed = false;
 if (mailboxInfo->mActive != active ||
 refreshAlways) {
 		// store the new state to permanent storage
 storeMailboxActive(mailboxId, active);
 mailboxInfo->mActive = active;
 changed = true;
 if (active) {
 // Mailbox is not yet assigned to any indicator
 if (mailboxInfo->mIndicatorIndex < 0) {
 */
 bool NmMailAgent::launchMailbox(quint64 mailboxId)
 {
 NM_FUNCTION;
+bool ok(false);
 XQApplicationManager appManager;
 XQAiwRequest *request = appManager.create(
 XQI_EMAIL_INBOX_VIEW, XQOP_EMAIL_INBOX_VIEW, false);
+// Instance might be NULL if the service is not available.
-QList<QVariant> list;
+if (request) {
-list.append(QVariant(mailboxId));
+QList<QVariant> list;
-request->setArguments(list);
+list.append(QVariant(mailboxId));
+request->setArguments(list);
-bool ok = request->send();
-NM_COMMENT(QString("Launch ok=%1 error=%2").arg(ok).arg(request->lastError()));
+ok = request->send();
-delete request;
+NM_COMMENT(QString("Launch ok=%1 error=%2").arg(ok).arg(request->lastError()));
+delete request;
+}
 return ok;
 }
 /*!
 Get next free indicator index, starting from 0
 switch(event) {
 case NmMailboxCreated:
 foreach (NmId mailboxId, mailboxIds) {
 getMailboxInfo(mailboxId); // create a new mailbox if needed
 // make sure the mailbox activity data is reseted
 deleteStoredMailboxActivity(mailboxId);
 }
 break;
 case NmMailboxChanged:
 break;
 case NmMailboxDeleted:
 foreach (NmId mailboxId, mailboxIds) {
 // Will hide also the indicator
 removeMailboxInfo(mailboxId);
 // make sure the mailbox activity data is deleted
 deleteStoredMailboxActivity(mailboxId);
 }
 updateUnreadIndicator();
 break;
 */
 void NmMailAgent::indicatorActivated(const QString &type, const QVariantMap &data)
 {
 NM_FUNCTION;
 Q_UNUSED(data);
 // map the indicator type to mailbox
 NmMailboxInfo *info = getMailboxByType(type);
 if (info) {
 info->mActive = false; // indicator is no longer active
 info->mInboxActive = false; // also inbox does not activate the indicator
 bool updateNeeded = false;
 bool activate = false;
 switch (event) {
 case NmMessageCreated: {
+// Check the new messages to make the indicator appear earlier
 NmMailboxInfo *mailboxInfo = getMailboxInfo(mailboxId);
-// Check the new messages to make the indicator appear earlier
+// Inbox folder ID may be still unknown
-if (mailboxInfo->mSyncState == Synchronizing) {
+if (mailboxInfo->mInboxFolderId.id() == 0) {
+NmDataPluginInterface *plugin =
-// Inbox folder ID may be still unknown
+mPluginFactory->interfaceInstance(mailboxId);
-if (mailboxInfo->mInboxFolderId.id()==0) {
-NmDataPluginInterface *plugin = mPluginFactory->interfaceInstance(mailboxId);
+if (plugin) {
-if (plugin) {
+mailboxInfo->mInboxFolderId =
-mailboxInfo->mInboxFolderId =
+plugin->getStandardFolderId(mailboxId, NmFolderInbox);
-plugin->getStandardFolderId(mailboxId, NmFolderInbox);
-}
 }
+}
-if (folderId == mailboxInfo->mInboxFolderId) {
-foreach (NmId messageId, messageIds) {
+if (folderId == mailboxInfo->mInboxFolderId) {
-bool messageUnread = false;
+foreach (NmId messageId, messageIds) {
+bool messageUnread = false;
-// Check the message if we can either play a tone or if the "@" is
-// not visible at the moment
+// Check the message if we can either play a tone or if the "@" is
-if (mAlertToneAllowed || !mUnreadIndicatorActive) {
+// not visible at the moment
-if (getMessageUnreadInfo(folderId, messageId, mailboxId, messageUnread)) {
+if (mAlertToneAllowed || !mUnreadIndicatorActive) {
-if (messageUnread) {
+if (getMessageUnreadInfo(folderId, messageId, mailboxId, messageUnread)) {
-mailboxInfo->mUnreadMailIdList.append(messageId);
+if (messageUnread) {
-mailboxInfo->mInboxActive = true;
+mailboxInfo->mUnreadMailIdList.append(messageId);
-updateMailboxState(mailboxId, true, false);
+mailboxInfo->mInboxActive = true;
+updateMailboxState(mailboxId, true, false);
-// make the "@" appear immediatelly
-updateUnreadIndicator(true);
+// make the "@" appear immediatelly
+updateUnreadIndicator(true);
-// Play the tone as well
-playAlertTone();
+// Play the tone as well
-}
+playAlertTone();
 }
 }
 }
 }
 }
 if (folderId==mailboxInfo->mInboxFolderId) {
 mailboxInfo->mInboxCreatedMessages += messageIds.count();
 }
 // When created a new mail in the outbox, we are in sending state
 					NM_COMMENT("NmMailAgent: first mail in outbox");
 }
 // Always activate the indicator
 activate = true;
 updateNeeded = true;
 mailboxInfo->mOutboxMails += messageIds.count();
 				updateSendIndicator();
 }
 break;
 }
 }
 // The last mail was now deleted
 if (mailboxInfo->mOutboxMails == 0) {
 					NM_COMMENT("NmMailAgent: last mail deleted from outbox");
-// Keep it active if there is unread mails and inbox is still active
+					updateNeeded = true;
-					if (mailboxInfo->mInboxActive &&
+	                // Keep it active if there is unread mails and inbox is still active
+				    if (mailboxInfo->mInboxActive &&
 					    mailboxInfo->mUnreadMailIdList.count() > 0) {
 					    activate = true;
-}
+	                }
-updateNeeded = true;
+				}
-}
+				else {
+	                // Also update the indicator status if it is already shown
+	            if (mailboxInfo->mActive) {
+						activate = true;
+	        updateNeeded = true;
+					}
+				}
 				updateSendIndicator();
 }
 break;
 }
 default:
 {
 NM_FUNCTION;
 	bool played = false;
 if (mAlertToneAllowed) {
-//mSystemTone->playTone(XQSystemToneService::EmailAlertTone);
+if (mSystemTone) {
+mSystemTone->playTone(XQSystemToneService::EmailAlertTone);
+}
 // Execute the vibra effect.
 if (mVibra) {
 TRAP_IGNORE(mVibra->StartVibraL(NmAgentDefaultVibraDuration));
 }
 // play alert only once per minute
 mAlertToneAllowed = false;
 QTimer::singleShot(NmAgentAlertToneTimer, this, SLOT(enableAlertTone()));
 		played = true;
 }
 void NmMailAgent::storeMailboxActive(const NmId &mailboxId, bool active)
 {
 XQCentralRepositorySettingsKey key(NmRepositoryId, mailboxId.id());
 XQSettingsManager mgr;
 XQCentralRepositoryUtils utils(mgr);
 if (active) {
 // when mailbox is active, key can be deleted
 utils.deleteKey(key);
 }
 else {
 utils.createKey(key,(int)active);
 }
 }
 /*!
 Get the mailbox activity state.
 \param mailboxId id of the mailbox
 \return true if the mailbox is active or no information was stored earlier
 */
 bool NmMailAgent::isMailboxActive(const NmId &mailboxId)
 {

changeset 47	f83bd4ae1fe3
parent 44	c2d07d913565
child 48	10eaf342f539