FCL/sf/app/commonemail: comparison ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp

equal deleted inserted replaced

-:e7aa27f58ae1
+:578830873419
 _LIT( KMimeTypeTextPlain, "text/plain" );
 _LIT( KMimeTypeTextHtml, "text/html" );
 _LIT( KMimeTypeTextRtf, "text/rtf" );
 _LIT( KSlash, "/" );
+// <cmail>
 _LIT( KCharSemicolon, ";" );
 _LIT( KCharEquals, "=" );
 _LIT( KCharsetTag, "CHARSET" );
-_LIT( KMessageExtension, ".eml" );
+// </cmail>
 // Supported multipart content types
 _LIT( KMimeTypeMultipartRelated, "multipart/related" );
 _LIT( KMimeTypeMultipartMixed, "multipart/mixed" );
 _LIT( KMimeTypeMultipartAlternative, "multipart/alternative" );
 _LIT( KMimeTypeMultipartParallel, "multipart/parallel" );
 const TInt KCharEscape       = 0x5C;
 const TInt KCharNonPrintable = 0x1F;
 const TInt KCharAt           = 0x40;
+// <cmail>
 const TInt KMaxContentTypeLength = 200;
-const TInt KEmbeddedMsgExtensionLength  = 4;
+// </cmail>
 // ======== CONSTRUCTORS & DESTRUCTOR ========
 // ---------------------------------------------------------------------------
 // CIpsPlgMsgMapper::NewL()
 TFSMailMsgId msgId( iPlugin.PluginId(), aEntry.Entry().Id() );
 CFSMailMessage* fsMsg = CFSMailMessage::NewLC( msgId );
 fsMsg->SetFolderId(
 TFSMailMsgId( iPlugin.PluginId(), aEntry.Entry().Parent() ) );
-// ERLN-7YUEX3
-fsMsg->SetMailBoxId(TFSMailMsgId( iPlugin.PluginId(), aEntry.Entry().iServiceId ));
-// End ERLN-7YUEX3
 CMsvStore* store( NULL );
 if ( aEntry.HasStoreL() )
 {
 store = aEntry.ReadStoreL();
 result->SetMailBoxId( aMailboxId );
 result->SetFolderId(
 TFSMailMsgId( iPlugin.PluginId(), aEntry.Parent() ) );
 SetFlags( aEntry, *result );
-SetFetchStateL( aEntry, aEntry.Id(), EFalse, *result );
+SetFetchState( aEntry, aEntry.Id(), EFalse ,*result );
 switch( aDetails )
 {
 case EFSMsgDataDate:
 SetDateL( aEntry, *result );
 {
 CMsvStore* store( NULL );
 CMsvEntry* cEntry = iSession.GetEntryL( aEntry.Id() );
 CleanupStack::PushL( cEntry );
-if ( cEntry )
+if ( cEntry && cEntry->HasStoreL() )
-	{
+{
-	if ( cEntry->HasStoreL() )
+store = cEntry->ReadStoreL();
-					{
+CleanupStack::PushL( store );
-					store = cEntry->ReadStoreL();
+}
-					CleanupStack::PushL( store );
-					}
+SetEnvelopeL( cEntry, store, *result );
-				SetEnvelopeL( cEntry, store, *result );
+// Apparently, this should be done only with
+// EFSMsgDataStructure, but EFSMsgDataEnvelope is currently
-				// Apparently, this should be done only with
+// used by assuming that it reads also the content-type of
-				// EFSMsgDataStructure, but EFSMsgDataEnvelope is currently
+// the message
-				// used by assuming that it reads also the content-type of
+SetStructureL( cEntry, *result );
-				// the message
-				SetStructureL( cEntry, *result );
+if ( store )
+{
-				if ( store )
+CleanupStack::PopAndDestroy( store );
-					{
+}
-					CleanupStack::PopAndDestroy( store );
+CleanupStack::PopAndDestroy( cEntry );
-					}
-				CleanupStack::PopAndDestroy( cEntry );
-	}
 break;
 }
 case EFSMsgDataIdOnly:
 default:
 break;
 result = ConvertFolderEntry2MessagePartL( tEntry,
 aMailBoxId, aMessageId );
 break;
 }
 case KUidMsvAttachmentEntryValue:
-case KUidMsvMessageEntryValue:
 {
 result = ConvertAttachmentEntry2MessagePartL( tEntry,
 aMailBoxId, aMessageId );
+break;
+}
+case KUidMsvMessageEntryValue:
+{
 break;
 }
 case KUidMsvEmailTextEntryValue:
 case KUidMsvEmailHtmlEntryValue:
 case KUidMsvEmailExternalBodyEntryValue:
 {
 FUNC_LOG;
 TInt msgFlags = aMessage.GetFlags();
 TBool modified ( EFalse );
 TBool unread( aEmlEntry.Unread() );
-if ( !LogicalXor( unread, msgFlags & EFSMsgFlag_Read ) )
+if ( !LogicalXor( unread, msgFlags & EFSMsgFlag_Read ) ||
+!LogicalXor( unread, msgFlags & EFSMsgFlag_Read_Locally ))
 {
 aEmlEntry.SetUnread( !unread );
 modified = ETrue;
 }
 TMsvEmailEntry tEntry( cEntry->Entry() );
 TBool isModified = ChangeTEntryFlagsL( tEntry, aMessage );
 if ( isModified )
 {
-CIpsPlgOperationWait* waiter = CIpsPlgOperationWait::NewLC();
+cEntry->ChangeL( tEntry );
-CMsvOperation* ops = cEntry->ChangeL( tEntry, waiter->iStatus );
-CleanupStack::PushL( ops );
-waiter->Start();
-CleanupStack::PopAndDestroy( 2, waiter );
 }
 CleanupStack::PopAndDestroy( cEntry );
 }
 const TMsvEmailEntry& aEntry,
 CFSMailMessage& aMsg )
 {
 FUNC_LOG;
-TBool forwardedMeetingRequest = EFalse;
 // EFSMsgFlag_Read
 // EFSMsgFlag_Read_Locally
 if ( aEntry.Unread() )
 {
 aMsg.ResetFlag( EFSMsgFlag_Read );
 if ( aEntry.ICalendar() )
 {
 // <cmail> implementation changed due to cs warning
 TInt attCount = 0;
 TRAPD ( err, attCount = GetAttachmentCountL( aEntry ) );
-if ( err == KErrNone && attCount == 1 )
+if ( err == KErrNone && attCount < 2 )
 	{
-	CMsvEntry* cEntry = NULL;
+// Only text/calendar part included as attachment
-	TRAPD ( err2, cEntry = iSession.GetEntryL( aEntry.Id() ) );
+aMsg.ResetFlag( EFSMsgFlag_Attachments );
-	if ( err2 == KErrNone && cEntry->Count() == 1 )
+//Set Attachment flag for CMsvEntry (needed for sorting)
-		{
+TRAP_IGNORE( SetAttachmentFlagL( aEntry, EFalse ) );
-		TMsvEmailEntry tEntry = (*cEntry)[0];
-		TImEmailFolderType ft = tEntry.MessageFolderType();
-		if ( tEntry.iType == KUidMsvFolderEntry && ft == EFolderTypeMixed  )
-			{
-	// Message with calendar object. But based on content type
-			// (multipart/mixed) we know that this is meeting request
-			// forwarded as email, so it must be seen as normal email.
-			forwardedMeetingRequest = ETrue;
-			aMsg.ResetFlag( EFSMsgFlag_CalendarMsg );
-			aMsg.SetFlag( EFSMsgFlag_Attachments );
-	}
-						else
-							{
-							// Only text/calendar part included as attachment
-							aMsg.ResetFlag( EFSMsgFlag_Attachments );
-							//Set Attachment flag for CMsvEntry (needed for sorting)
-							TRAP_IGNORE( SetAttachmentFlagL( aEntry, EFalse ) );
-							}
-		}
-	delete cEntry;
-	cEntry = NULL;
 	}
 // </cmail>
 }
 }
 else
 // to evaluate the value, the CMsvStore of the message should be
 // accessed which is relatively slow (compared to the access of
 // the index entry)
 // EFSMsgFlag_CalendarMsg
-if ( aEntry.ICalendar() && !forwardedMeetingRequest ) // <cmail>
+if ( aEntry.ICalendar() )
 {
 aMsg.SetFlag( EFSMsgFlag_CalendarMsg );
 }
 else if( !( aMsg.GetFlags() & EFSMsgFlag_CalendarMsg ) )
 {
 }
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
-void CIpsPlgMsgMapper::SetFetchStateL(
+void CIpsPlgMsgMapper::SetFetchState(
 const TMsvEmailEntry& aEntry,
 TMsvId aMsgMainId,
 TBool aIsAtta,
 CFSMailMessagePart& aMessage )
 {
 FUNC_LOG;
-if ( aEntry.iMtm.iUid == KSenduiMtmPop3UidValue &&
+if ( aEntry.iMtm.iUid == KSenduiMtmPop3UidValue
-aEntry.Id() != aMsgMainId &&
+&& aEntry.Id() != aMsgMainId )
-!aIsAtta )
 {
 TInt error = KErrNone;
 TMsvEmailEntry emlEntry;
 TMsvId dummy;
 error = iSession.GetEntry( aMsgMainId , dummy, emlEntry );
 if ( error == KErrNone )
 {
-DoSetFetchStateL( emlEntry, aMsgMainId, aIsAtta, aMessage );
+SetFetchStateImap( emlEntry, aMsgMainId, aIsAtta ,aMessage );
 }
 else
 {
 aMessage.SetMessagePartsStatus( EFSEmailStructureUnknown );
 }
 }
 else
 {
-DoSetFetchStateL( aEntry, aMsgMainId, aIsAtta, aMessage );
+SetFetchStateImap( aEntry, aMsgMainId, aIsAtta, aMessage );
 }
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
-void CIpsPlgMsgMapper::DoSetFetchStateL(
+void CIpsPlgMsgMapper::SetFetchStateImap(
 const TMsvEmailEntry& aEntry,
 TMsvId aMsgMainId,
 TBool aIsAtta,
 CFSMailMessagePart& aMessage )
 {
 FUNC_LOG;
 if ( aEntry.PartialDownloaded() )
 {
 aMessage.SetMessagePartsStatus( EFSPartial );
 }
-else if ( aEntry.BodyTextComplete() && !aIsAtta )
+else if ( aEntry.Complete() || (aEntry.BodyTextComplete() && !aIsAtta) )
 {
 aMessage.SetMessagePartsStatus( EFSFull );
-}
-else if ( aEntry.Complete() && !aIsAtta )
-{
-aMessage.SetMessagePartsStatus( EFSFull );
-}
-else if ( aEntry.Complete() && aIsAtta )
-{
-CMsvEntry* cEntry = iSession.GetEntryL( aEntry.Id() );
-CleanupStack::PushL( cEntry );
-TBool hasStore = cEntry->HasStoreL();
-if ( hasStore )
-{
-CMsvStore* store = cEntry->EditStoreL();
-CleanupStack::PushL( store );
-MMsvAttachmentManager& attMgr = store->AttachmentManagerL();
-if ( attMgr.AttachmentCount() )
-{
-aMessage.SetMessagePartsStatus( EFSFull );
-}
-else
-{
-aMessage.SetMessagePartsStatus( EFSNone );
-}
-CleanupStack::PopAndDestroy( store );
-}
-CleanupStack::PopAndDestroy( cEntry );
 }
 else if ( aEntry.Id() != aMsgMainId )
 {
 // fetch state of some message part, then we sure know
 // structure, but its not complete nor partial so state must be
 result->SetFetchedContentSize( 0 );
 }
 CleanupStack::Pop( result );
 }
-SetFetchStateL( aEntry, aMessageId.Id(), EFalse, *result );
+SetFetchState( aEntry, aMessageId.Id(), EFalse, *result );
+// <cmail>
 CleanupStack::PopAndDestroy( buf );
+// </cmail>
 return result;
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 FUNC_LOG;
 CFSMailMessagePart* result( NULL );
 HBufC* buffer;
 CMsvEntry* cEntry;
-__ASSERT_DEBUG( ( aEntry.iType == KUidMsvAttachmentEntry ||
+__ASSERT_DEBUG( ( aEntry.iType == KUidMsvAttachmentEntry ),
-	aEntry.iType == KUidMsvMessageEntry ),
 User::Panic( KIpsPlgPanicCategory, EIpsPlgInvalidEntry ) );
 cEntry = iSession.GetEntryL( aEntry.Id() );
 CleanupStack::PushL( cEntry );
 {
 CImMimeHeader* mimeHeader = CImMimeHeader::NewLC();
 mimeHeader->RestoreL( *store );
 // Content-type
-if ( aEntry.iType.iUid == KUidMsvMessageEntryValue )
+SetContentTypeL( *mimeHeader, *result );
-{
-result->SetContentType( KMimeTypeMultipartRfc822 );
-}
-else
-{
-SetContentTypeL( *mimeHeader, *result );
-}
 // Content-description
 buffer = HBufC::NewLC(
 mimeHeader->ContentDescription().Length ( ) );
 buffer->Des().Copy ( mimeHeader->ContentDescription ( ) );
 // Content-class: not supported by Symbian (non-standard field)
 CleanupStack::PopAndDestroy( mimeHeader );
 }
 // Name
-if ( aEntry.iType.iUid == KUidMsvMessageEntryValue )
+result->SetAttachmentNameL( aEntry.iDetails );
-{
-HBufC* att = HBufC::NewLC( aEntry.iDescription.Length() + KEmbeddedMsgExtensionLength );
-att->Des().Copy( aEntry.iDescription );
-att->Des().Append( KMessageExtension );
-result->SetAttachmentNameL( att->Des() );
-CleanupStack::PopAndDestroy( att );
-}
-else
-{
-result->SetAttachmentNameL( aEntry.iDetails );
-}
 // Size
 result->SetContentSize( aEntry.iSize );
 if ( aEntry.Complete() )
 {
 result->SetFetchedContentSize( 0 );
 }
 result->SetMailBoxId( aMailBoxId );
 CleanupStack::PopAndDestroy(store);
-SetFetchStateL( aEntry, aMessageId.Id(), ETrue, *result );
 CleanupStack::Pop( result );
 }
+SetFetchState( aEntry, aMessageId.Id(), ETrue ,*result );
 CleanupStack::PopAndDestroy( cEntry );
 return result;
 }
 	CMsvEntry* cEntry = iSession.GetEntryL( aEntry.Id() );
 	CleanupStack::PushL( cEntry );
 	// Only text/calendar part included as attachment
 	TMsvEmailEntry entryToBeChanged( aEntry );
 	entryToBeChanged.SetAttachment( aHasAttachment );
-	CIpsPlgOperationWait* waiter = CIpsPlgOperationWait::NewLC();
+	cEntry->ChangeL( entryToBeChanged );
-	CMsvOperation* ops = cEntry->ChangeL( entryToBeChanged, waiter->iStatus );
-	CleanupStack::PushL( ops );
+	CleanupStack::PopAndDestroy( cEntry );
-	waiter->Start();
-	CleanupStack::PopAndDestroy( 3, cEntry );
 	}
 // </cmail>
 // <cmail>
 // ---------------------------------------------------------------------------

changeset 18	578830873419
parent 3	a4d6f1ea0416
child 23	2dc6caa42ec3