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

equal deleted inserted replaced

-:dcf0eedfc1a3
+:d189ee25cf9d
 FUNC_LOG;
 TInt msgFlags = aMessage.GetFlags();
 TBool modified ( EFalse );
 TBool unread( aEmlEntry.Unread() );
-if ( !LogicalXor( unread, msgFlags & EFSMsgFlag_Read ) )
+// <qmail>
+if ( LogicalXor( unread, msgFlags & EFSMsgFlag_Read ) ||
+LogicalXor( unread, msgFlags & EFSMsgFlag_Read_Locally ))
+// </qmail>
 {
 aEmlEntry.SetUnread( !unread );
 modified = ETrue;
 }
 // EFSMsgFlag_Answered: supported only with IMAP4 (see below)
 // EFSMsgFlag_Forwarded: no counterpart in Symbian message in S60 3.1
-if ( LogicalXor( aEmlEntry.Forwarded(), msgFlags & EFSMsgFlag_Forwarded ) )
-{
-aEmlEntry.SetForwarded( !aEmlEntry.Forwarded() );
-modified = ETrue;
-}
 // EFSMsgFlag_OnlyToMe: no counterpart in Symbian message
 // EFSMsgFlag_RemoteDeleted: no counterpart in Symbian message
 CMsvEntry* cEntry = iSession.GetEntryL( aEntryId );
 CleanupStack::PushL( cEntry );
 TMsvEmailEntry tEntry( cEntry->Entry() );
 TBool isModified = ChangeTEntryFlagsL( tEntry, aMessage );
+// <qmail>
 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 );
+// </qmail>
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 CMsvOperation* CIpsPlgMsgMapper::UpdateMessageFlagsAsyncL(
 	}
 						else
 							{
 							// Only text/calendar part included as attachment
 							aMsg.ResetFlag( EFSMsgFlag_Attachments );
-							//Set Attachment flag for CMsvEntry (needed for sorting)
+							// <qmail> remove call to SetAttachmentFlagL(), because shouln't be needed any more
-							TRAP_IGNORE( SetAttachmentFlagL( aEntry, EFalse ) );
 							}
 		}
 	delete cEntry;
 	cEntry = NULL;
 	}
 // EFSMsgFlag_Answered: supported only with IMAP4 messages (see below)
 aMsg.ResetFlag( EFSMsgFlag_Answered );
 // EFSMsgFlag_Forwarded: not supported in S60 3.1
-if ( aEntry.Forwarded() )
+aMsg.ResetFlag( EFSMsgFlag_Forwarded );
-{
-aMsg.SetFlag( EFSMsgFlag_Forwarded );
-}
-else
-{
-aMsg.ResetFlag( EFSMsgFlag_Forwarded );
-}
 // EFSMsgFlag_OnlyToMe: like EFSMsgFlag_Multiple
 // EFSMsgFlag_RemoteDeleted: no reasonable use in IPS
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // <cmail>
 TInt CIpsPlgMsgMapper::ConvertBodyPartMimeType(
-const TUid& aEntryType,
+const TMsvEmailEntry& aEntry,
 TDes& aMimeType )
 {
 FUNC_LOG;
 TInt result( KErrNone );
-switch ( aEntryType.iUid )
+switch ( aEntry.iType.iUid )
 {
 case KUidMsvEmailTextEntryValue:
 {
+if( aEntry.ICalendar() )
+{
+aMimeType.Append( KFSMailContentTypeTextCalendar );
+}
+else
+{
 aMimeType.Append( KMimeTypeTextPlain );
+}
 break;
 }
 case KUidMsvEmailHtmlEntryValue:
 {
 aMimeType.Append( KMimeTypeTextHtml );
 else
 {
 childPart = GetMessagePartL( (*cEntry)[0].Id(), aMailBoxId, aMessageId );
 if( childPart )
 {
-aParts.Append( childPart );
+aParts.AppendL( childPart );
 }
 }
 }
 CleanupStack::PopAndDestroy( cEntry );
 }
 }
 // Insert the new child part to the result array
 if ( childPart )
 {
-aParts.Insert( childPart, position );
+aParts.InsertL( childPart, position );
 childPart = NULL;
 }
 }
 CleanupStack::PopAndDestroy( cEntry );
 }
 const TFSMailMsgId& aMessageId )
 {
 FUNC_LOG;
 CFSMailMessagePart* result( NULL );
 TInt status;
-// <cmail>
 HBufC* buf = HBufC::NewLC( KMaxContentTypeLength );
 TPtr contentType = buf->Des();
-status = ConvertBodyPartMimeType( aEntry.iType, contentType );
+status = ConvertBodyPartMimeType( aEntry, contentType );
 __ASSERT_DEBUG( ( status == KErrNone ),
 User::Panic( KIpsPlgPanicCategory, EIpsPlgInvalidEntry ) );
 if ( status == KErrNone )
 {
 result = CFSMailMessagePart::NewLC(
 // If mimetype is 'text/html' add charset parameter
 if ( aEntry.iType.iUid == KUidMsvEmailHtmlEntryValue )
 {
 GetCharsetParameterL( aEntry, contentType );
 }
-// </cmail>
 result->SetContentType( contentType );
 result->SetMailBoxId( aMailBoxId );
 // Size
 result->SetContentSize( aEntry.iSize );
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // <cmail>
-void CIpsPlgMsgMapper::SetAttachmentFlagL( const TMsvEmailEntry& aEntry,
+void CIpsPlgMsgMapper::SetAttachmentFlagL( const TMsvEmailEntry& /*aEntry*/,
-										   TBool aHasAttachment )
+										   TBool /*aHasAttachment*/ )
 	{
 	FUNC_LOG;
-	CMsvEntry* cEntry = iSession.GetEntryL( aEntry.Id() );
+	// <qmail> commented out, causing freeze in message list
+	/*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();
-	CMsvOperation* ops = cEntry->ChangeL( entryToBeChanged, waiter->iStatus );
+	cEntry->ChangeL( entryToBeChanged );
-	CleanupStack::PushL( ops );
+	CleanupStack::PopAndDestroy( cEntry );*/
-	waiter->Start();
+// </qmail>
-	CleanupStack::PopAndDestroy( 3, cEntry );
 	}
-// </cmail>
-// <cmail>
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 void CIpsPlgMsgMapper::GetCharsetParameterL(
 const TMsvEmailEntry& aEntry, TDes& aContentType )
 {
 {
 CImMimeHeader* mimeHeader = CImMimeHeader::NewLC();
 mimeHeader->RestoreL( *store );
 TInt count = mimeHeader->ContentTypeParams().MdcaCount();
-INFO_1("# of CT params: %d", count);
+//INFO_1("# of CT params: %d", count);
 for ( TInt i = 0; i < count; i++ )
 {
 TPtrC8 key8 = mimeHeader->ContentTypeParams().MdcaPoint( i );
-INFO_1("%S", &key8);
+//INFO_1("%S", &key8);
 TPtr16 keyUppercase16 = HBufC::NewLC( key8.Length() )->Des();
 keyUppercase16.Copy( key8 );
 keyUppercase16.UpperCase();
 if ( keyUppercase16.Compare( KCharsetTag ) == 0 &&
 count >= i+1 ) // prevent possible indexing over array limits

branch	RCL_3
changeset 24	d189ee25cf9d
parent 23	dcf0eedfc1a3
child 25	3533d4323edc