MCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiHtmlViewerContainer.cpp

equal deleted inserted replaced

-:0396474f30f5
+:4ce476e64c59
 _LIT( KCharsetTag, "charset");
 _LIT8( KHTMLEmptyContent, "<HTML><BODY></BODY></HTML>");
 _LIT( KHTMLDataScheme, "data:0");
-_LIT8( KHtmlLineBreak, "<br>" );
+_LIT( KHtmlLineBreak, "<br>" );
-_LIT8( KHtmlLineBreakCRLF, "<br>\xD\xA" );
+_LIT( KHtmlLineBreakCRLF, "<br>\xD\xA" );
-_LIT8( KHtmlLessThan, "&lt;" );
+_LIT( KHtmlLessThan, "&lt;" );
-_LIT8( KHtmlGreaterThan, "&gt;" );
+_LIT( KHtmlGreaterThan, "&gt;" );
-_LIT8( KHtmlAmpersand, "&amp;" );
+_LIT( KHtmlAmpersand, "&amp;" );
-_LIT8( KHtmlQuotation, "&quot;" );
+_LIT( KHtmlQuotation, "&quot;" );
-_LIT8( KHtmlLinkTag, "<a href=\"%S\">" );
+_LIT( KHtmlLinkTag, "<a href=\"%S\">" );
-_LIT8( KHtmlLinkTagWWW, "<a href=\"%S%S\">" );
+_LIT( KHtmlLinkTagWWW, "<a href=\"%S%S\">" );
-_LIT8( KHtmlLinkEndTag, "</a>" );
+_LIT( KHtmlLinkEndTag, "</a>" );
 _LIT( KURLTypeBody, "body");
 _LIT( KURLDisplayImages, "cmail://displayImages/" );
 _LIT( KURLLoadImages, "cmail://loadImages/" );
 _LIT( KURLCollapseHeader, "cmail://collapseHeader/" );
 _LIT( KURLExpandHeader, "cmail://expandHeader/" );
-const TText8 KGreaterThan = 0x3e;
+const TText KGreaterThan = 0x3e;
-const TText8 KLessThan = 0x3c;
+const TText KLessThan = 0x3c;
-const TText8 KAmpersand = 0x26;
+const TText KAmpersand = 0x26;
-const TText8 KQuotation = 0x22;
+const TText KQuotation = 0x22;
-const TText8 KCharacterSpace = 0x20;
+const TText KCharacterSpace = 0x20;
-const TText8 KSOH = 0x01; // Start Of Heading
+const TText KSOH = 0x01; // Start Of Heading
-const TText8 KCR = 0x0d; // Carriage Return
+const TText KCR = 0x0d; // Carriage Return
-const TText8 KLF = 0x0a; // Line Feed
+const TText KLF = 0x0a; // Line Feed
-const TText8 KHT = 0x09; // Horizontal Tab
+const TText KHT = 0x09; // Horizontal Tab
+const TText KUnicodeNewLineCharacter = 0x2028;
+const TText KUnicodeParagraphCharacter = 0x2029;
 const TReal KOverlayButtonMarginX = 0.01; // 1%
 const TReal KOverlayButtonMarginY = 0.01; // 1%
 const TReal KOverlayButtonSizeP = 0.15; // 15%
 const TReal KOverlayButtonSizeLs = 0.20; // 25%
 HBufC* content = HBufC::NewLC( aTextBodyPart.FetchedContentSize() );
 TPtr contentPtr( content->Des() );
 aTextBodyPart.GetContentToBufferL( contentPtr, 0 );
-HBufC8* content8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L( *content );
+ConvertToHTML( *content, targetFileName, aTextBodyPart );
 CleanupStack::PopAndDestroy( content );
-CleanupStack::PushL( content8 );
-ConvertToHTML( *content8, targetFileName, aTextBodyPart );
-CleanupStack::PopAndDestroy( content8 );
 }
 // ---------------------------------------------------------------------------
 // Reads given file content to buffer and return pointer to it
 // ---------------------------------------------------------------------------
 CleanupStack::PopAndDestroy( &attachmentFile );
 }
 else
 {
 TPartData partData;
-partData.iMailBoxId = iMessage->GetMailBoxId();
+if( iMessage )
-partData.iFolderId = iMessage->GetFolderId();
+{
-partData.iMessageId = iMessage->GetMessageId();
+partData.iMailBoxId = iMessage->GetMailBoxId();
-partData.iMessagePartId = aAttachment.GetPartId();
+partData.iFolderId = iMessage->GetFolderId();
+partData.iMessageId = iMessage->GetMessageId();
-if ( iAppUi.DownloadInfoMediator() &&
-iAppUi.DownloadInfoMediator()->IsDownloadableL( partData ) )
+partData.iMessagePartId = aAttachment.GetPartId();
-{
-ASSERT( iLinkContents.Count() == iMessageParts.Count() );
+if ( iAppUi.DownloadInfoMediator() &&
+iAppUi.DownloadInfoMediator()->IsDownloadableL( partData ) )
-// Append message part details and embedded link content interface
-// to corresponding arrays so that the content can be returned
-// when the download is completed.
-iLinkContents.AppendL( &aEmbeddedLinkContent );
-if ( iMessageParts.Append( partData ) != KErrNone )
 {
-iLinkContents.Remove( iLinkContents.Count() - 1 );
+ASSERT( iLinkContents.Count() == iMessageParts.Count() );
-}
+// Append message part details and embedded link content interface
-ASSERT( iLinkContents.Count() == iMessageParts.Count() );
+// to corresponding arrays so that the content can be returned
-if(!iView.GetAsyncFetchStatus())
+// when the download is completed.
-{
+iLinkContents.AppendL( &aEmbeddedLinkContent );
-iAppUi.DownloadInfoMediator()->AddObserver( this, aAttachment.GetMessageId() );
+if ( iMessageParts.Append( partData ) != KErrNone )
-iObservingDownload=ETrue;
+{
-iAppUi.DownloadInfoMediator()->DownloadL( partData, EFalse );
+iLinkContents.Remove( iLinkContents.Count() - 1 );
+}
+ASSERT( iLinkContents.Count() == iMessageParts.Count() );
+if(!iView.GetAsyncFetchStatus())
+{
+iAppUi.DownloadInfoMediator()->AddObserver( this, aAttachment.GetMessageId() );
+iObservingDownload=ETrue;
+iAppUi.DownloadInfoMediator()->DownloadL( partData, EFalse );
+}
 }
 }
 }
 }
 // ---------------------------------------------------------------------------
 // Writes buffer content to given file after adding tags
 // ---------------------------------------------------------------------------
 //
 // <cmail>
-void CFsEmailUiHtmlViewerContainer::ConvertToHTML( const TDesC8& aContent,
+void CFsEmailUiHtmlViewerContainer::ConvertToHTML( const TDesC& aContent,
 const TDesC& aFileName, CFSMailMessagePart& /*aTextBodyPart*/ )
 {
 FUNC_LOG;
-const TInt KBodyTextChunkSizeBytes = 1024;
+const TInt KBodyTextChunkSize = 2048;
 if ( SysUtil::DiskSpaceBelowCriticalLevelL( &iFs, aContent.Size(), EDriveC ) )
 {
 // Can not write the data, there's not enough free space on disk.
 User::Leave( KErrDiskFull );
 }
 else
 {
-CBufBase* bodyBuf = CBufSeg::NewL( KBodyTextChunkSizeBytes );
+RBuf bodyBuf;
-CleanupStack::PushL( bodyBuf );
+bodyBuf.CreateL( aContent.Size() + KBodyTextChunkSize );
+bodyBuf.CleanupClosePushL();
-bodyBuf->InsertL( 0, aContent );
+bodyBuf.Insert( 0, aContent);
+TInt maxlength = bodyBuf.MaxSize();
 TInt position( 0 );
-TText8 previous = 0;
+TText previous = 0;
 TBool EndOfString( EFalse );
 while ( !EndOfString )
 {
 TInt startPosition = position;
-TPtr8 segment( bodyBuf->Ptr( startPosition ) );
+TPtr segment( bodyBuf.MidTPtr( startPosition ) );
-int i = 0;
+TInt i = 0;
 while(i < segment.Length())
 {
 TInt currentPos = position + i;
-TText8 ch = segment[i];
+TText ch = segment[i];
 switch( ch )
 {
 case KSOH:  // end of line for IMAP and POP
-bodyBuf->Delete( currentPos, 1 );
+bodyBuf.Delete( currentPos, 1 );
-bodyBuf->InsertL( currentPos, KHtmlLineBreakCRLF );
+maxlength = maxlength + KHtmlLineBreakCRLF().Length();
+bodyBuf.ReAlloc( maxlength );
+bodyBuf.Insert( currentPos, KHtmlLineBreakCRLF );
 i += KHtmlLineBreakCRLF().Length();
-segment.Set( bodyBuf->Ptr( startPosition ) );
+segment.Set( bodyBuf.MidTPtr( startPosition ) );
 break;
 case KLF: // line feed
-if ( previous == KCR )
+case KUnicodeNewLineCharacter:
-{
+case KUnicodeParagraphCharacter:
-bodyBuf->InsertL( currentPos, KHtmlLineBreak );
+maxlength = maxlength + KHtmlLineBreak().Length();
-i += KHtmlLineBreak().Length();
+bodyBuf.ReAlloc( maxlength );
-segment.Set( bodyBuf->Ptr( startPosition ) );
+bodyBuf.Insert( currentPos, KHtmlLineBreak );
-}
+i += KHtmlLineBreak().Length() + 1;
-else
+segment.Set( bodyBuf.MidTPtr( startPosition ) );
-{
-i++;
-}
 break;
 case KQuotation:
-bodyBuf->Delete( currentPos, 1 );
+bodyBuf.Delete( currentPos, 1 );
-bodyBuf->InsertL( currentPos, KHtmlQuotation );
+maxlength = maxlength + KHtmlQuotation().Length();
+bodyBuf.ReAlloc( maxlength );
+bodyBuf.Insert( currentPos, KHtmlQuotation );
 i += KHtmlQuotation().Length();
-segment.Set( bodyBuf->Ptr( startPosition ) );
+segment.Set( bodyBuf.MidTPtr( startPosition ) );
 break;
 case KAmpersand:
-bodyBuf->Delete( currentPos, 1 );
+bodyBuf.Delete( currentPos, 1 );
-bodyBuf->InsertL( currentPos, KHtmlAmpersand );
+maxlength = maxlength + KHtmlAmpersand().Length();
+bodyBuf.ReAlloc( maxlength  );
+bodyBuf.Insert( currentPos, KHtmlAmpersand );
 i += KHtmlAmpersand().Length();
-segment.Set( bodyBuf->Ptr( startPosition ) );
+segment.Set( bodyBuf.MidTPtr( startPosition ) );
 break;
 case KGreaterThan:
-bodyBuf->Delete( currentPos, 1 );
+bodyBuf.Delete( currentPos, 1 );
-bodyBuf->InsertL( currentPos, KHtmlGreaterThan );
+maxlength = maxlength + KHtmlGreaterThan().Length();
+bodyBuf.ReAlloc( maxlength );
+bodyBuf.Insert( currentPos, KHtmlGreaterThan );
 i += KHtmlGreaterThan().Length();
-segment.Set( bodyBuf->Ptr( startPosition ) );
+segment.Set( bodyBuf.MidTPtr( startPosition ) );
 break;
 case KLessThan:
-bodyBuf->Delete( currentPos, 1 );
+bodyBuf.Delete( currentPos, 1 );
-bodyBuf->InsertL( currentPos, KHtmlLessThan );
+maxlength =  maxlength + KHtmlLessThan().Length();
+bodyBuf.ReAlloc( maxlength );
+bodyBuf.Insert( currentPos, KHtmlLessThan );
 i += KHtmlLessThan().Length();
-segment.Set( bodyBuf->Ptr( startPosition ) );
+segment.Set( bodyBuf.MidTPtr( startPosition ) );
 break;
 default:
 i++;
 break;
 }
 previous = ch;
 }
 position += segment.Length();
-if ( ( bodyBuf->Size() - position ) <= 0 )
+if ( ( bodyBuf.Length() - position ) <= 0 )
 {
 EndOfString = ETrue;
 }
 }
-CreateHyperlinksFromUrlsL( *bodyBuf );
+CreateHyperlinksFromUrlsL( bodyBuf );
+HBufC8* content8 = CnvUtfConverter::ConvertFromUnicodeToUtf8L( bodyBuf );
+CleanupStack::PushL( content8 );
 RFile targetFile;
 CleanupClosePushL( targetFile );
 User::LeaveIfError( targetFile.Replace( iFs, aFileName, EFileWrite ) );
 RBuf8 messageHeader;
-_LIT8( KCharsetUtf8, "UTF-8" );
+_LIT( KCharsetUtf8, "UTF-8" );
 TInt bufSize = KHtmlHeader1().Length() + KCharsetUtf8().Length() + KHtmlHeader2().Length();
 messageHeader.CreateL( bufSize );
 messageHeader.CleanupClosePushL();
 messageHeader.Append( KHtmlHeader1 );
 RFileWriteStream fileStream( targetFile );
 fileStream.PushL();
 fileStream.WriteL( messageHeader.Ptr(), messageHeader.Length() );
 TInt bufPos( 0 );
-TInt bufTotalSize = bodyBuf->Size();
+TInt bufTotalSize = content8->Size();
 while ( bufPos < bufTotalSize )
 {
-TInt segmentLength = bodyBuf->Ptr( bufPos ).Length();
+TInt segmentLength = content8->Mid( bufPos ).Length();
-fileStream.WriteL( bodyBuf->Ptr( bufPos ).Ptr(), segmentLength );
+fileStream.WriteL( content8->Mid( bufPos ).Ptr(), segmentLength );
 bufPos += segmentLength;
 }
 fileStream.CommitL();
 CleanupStack::PopAndDestroy( &fileStream );
 CleanupStack::PopAndDestroy( &messageHeader );
 CleanupStack::PopAndDestroy( &targetFile );
-CleanupStack::PopAndDestroy( bodyBuf );
+CleanupStack::PopAndDestroy( content8 );
+CleanupStack::PopAndDestroy( &bodyBuf ); // calls bodyBuf.Close();
 // </cmail>
 }
 }
 // ---------------------------------------------------------------------------
 // Finds and html formats hyperlinks in a document
 // ---------------------------------------------------------------------------
 //
 // <cmail>
-void CFsEmailUiHtmlViewerContainer::CreateHyperlinksFromUrlsL( CBufBase& aSource )
+void CFsEmailUiHtmlViewerContainer::CreateHyperlinksFromUrlsL( RBuf& aSource )
 {
 FUNC_LOG;
 const TInt urlMaxLength = 2048;
-_LIT8( KHttp, "http://" );
+_LIT( KHttp, "http://" );
-_LIT8( KHttps, "https://");
+_LIT( KHttps, "https://");
-_LIT8( KWww, "www.");
+_LIT( KWww, "www.");
 TBool eos( aSource.Size() <= 0 );
 TInt position( 0 );
 TInt carryOverInc( 0 );
+TInt maxlength = aSource.Length();
 while ( !eos )
 {
-while ( carryOverInc >= aSource.Ptr( position ).Length() && aSource.Size() != 0 )
+while ( carryOverInc >= aSource.MidTPtr( position ).Length() && aSource.Size() != 0 )
 { // Skip segments of overlapping url string
-carryOverInc -= aSource.Ptr( position ).Length();
+carryOverInc -= aSource.MidTPtr( position ).Length();
-position += aSource.Ptr( position ).Length();
+position += aSource.MidTPtr( position ).Length();
 }
-TPtr8 segment( aSource.Ptr( position ) );
+TPtr16 segment( aSource.MidTPtr( position ) );
-TLex8 lexSegment( segment );
+TLex16 lexSegment( segment );
 lexSegment.Inc( carryOverInc );
 carryOverInc = 0;
 while (!lexSegment.Eos())
 {
-TPtrC8 nextToken( lexSegment.NextToken() );
+TPtrC nextToken( lexSegment.NextToken() );
 TInt foundAt( KErrNotFound );
 // Find HTTP, HTTPS, or WWW link in CBufSeg segment of size 1024 bytes.
 if ( ( ( foundAt = nextToken.FindC( KHttp ) ) != KErrNotFound ) ||
 (  ( foundAt = nextToken.FindC( KHttps ) ) != KErrNotFound ) ||
 {
 if ( !lexSegment.Eos() )
 {
 if ( !foundAt )
 { // Token starts with http/https/www.x
-TPtrC8 url;
+TPtrC url;
 TInt lineBreakPos( KErrNotFound );
 if ( ( lineBreakPos = nextToken.FindC( KHtmlLineBreak ) ) != KErrNotFound )
 { // Token contains html line break -> remove
 url.Set( nextToken.Left( lineBreakPos ) );
 }
 url.Set( nextToken );
 }
 if ( url.CompareC( KWww ) != KErrNone ) // if token=www., validate format
 {                                   // www.x
-RBuf8 urlBuf;
+RBuf urlBuf;
 TBool wwwLink( EFalse );
 if ( url.Left( KWww().Length() ).CompareF( KWww ) == 0 )
 {
 wwwLink = ETrue;
 //Hyperlinks beginning with www. needs http:// prefix
 TInt segOffset = lexSegment.Offset();
 TInt urlLength = urlBuf.Length();
 //Test
 TInt offset = lexSegment.Offset() - nextToken.Length();
-TLexMark8 tokenMark;
+TLexMark tokenMark;
 // Move next character last token back
 lexSegment.Inc( - nextToken.Length() );
 lexSegment.Mark( tokenMark );
 aSource.Delete( offset + position, nextToken.Length() );
-aSource.InsertL( offset + position, urlBuf );
+aSource.ReAlloc( maxlength + urlBuf.Length() );
-segment.Set( aSource.Ptr( position ) );
+aSource.Insert( offset + position, urlBuf );
+segment.Set( aSource.MidTPtr( position ) );
 lexSegment.Assign( segment );
 // Set next character to the position of inserted hyperlink
 lexSegment.UnGetToMark( tokenMark );
 // If Max segment length is reached, set carry over value to
 }
 }
 else
 // Next token is end of string, here we handle the last token of a segment
 {
-_LIT8( KUrlEnd, "<" );
+_LIT( KUrlEnd, "<" );
 TInt endOfUrlPos( KErrNotFound );
-TText8 ch = segment[ segment.Length() - 1];
+TText ch = segment[ segment.Length() - 1];
-RBuf8 url;
+RBuf url;
 url.CreateL( urlMaxLength );
 url.CleanupClosePushL();
 // Find if hyperlink ends within this segment boundaries
 if ( ch == KSOH || ch == KCR || ch == KLF || ch == KHT || ch == KCharacterSpace )
 endOfUrlPos = nextToken.Length() - KHtmlLineBreak().Length() + endOfUrlPos;
 }
 else
 { // Handle hyperlink spread in multiple segments
 TInt nextPos = position;
-TPtrC8 nextSegment( aSource.Ptr( nextPos ) );
+TPtrC nextSegment( aSource.MidTPtr( nextPos ) );
-TLex8 lexNextSegment( nextSegment );
+TLex lexNextSegment( nextSegment );
-TPtrC8 nextNextToken( nextToken );
+TPtrC nextNextToken( nextToken );
 TBool firstPass( ETrue );
-while ( endOfUrlPos == KErrNotFound || nextPos >= aSource.Size() )
+while ( endOfUrlPos == KErrNotFound || nextPos >= aSource.Length() )
 {
 if ( ( url.Length() + nextNextToken.Length() )  > urlMaxLength )
 { // URL exceeds limit of 2K, do nothing
 break;
 }
 if ( ( nextSegment.Length() == nextNextToken.Length() ) || firstPass )
 { // Token takes up the whole segment, or first pass( first segment
 // with last token where hyperlink does not end within segment's
 // boundaries, move to next segment
 nextPos += nextSegment.Length();
-nextSegment.Set( aSource.Ptr( nextPos ) );
+nextSegment.Set( aSource.MidTPtr( nextPos ) );
 if( nextSegment.Length() == 0 )
 {
 break;
 }
 lexNextSegment.Assign( nextSegment );
 }
 }
 if ( endOfUrlPos != KErrNotFound )
 { // Handle hyperlink that is within 2K limit
-RBuf8 urlBuf;
+RBuf urlBuf;
 TBool wwwLink( EFalse );
 if ( url.Left( KWww().Length() ).CompareF( KWww ) == 0 )
 {
 wwwLink = ETrue;
 TInt offset = lexSegment.Offset() - nextToken.Length();
 // Remove hyperlink from the original message body
 aSource.Delete( offset + position, url.Length() );
 // Insert html formated hyperlink
-aSource.InsertL( offset + position, urlBuf );
+aSource.ReAlloc( maxlength + urlBuf.Length() );
-segment.Set( aSource.Ptr( position ) );
+aSource.Insert( offset + position, urlBuf );
+segment.Set( aSource.MidTPtr( position ) );
 // Set carry on value to mark where new token should start in following segment
 carryOverInc = endOfUrlPos;
 position = nextPos;
 CleanupStack::PopAndDestroy( &url );
 }
 }
 }
 position += segment.Length();
-if ( ( aSource.Size() - position ) <= 0 )
+if ( ( aSource.Length() - position ) <= 0 )
 {
 eos = ETrue;
 }
 }
 {
 CCoeControl::HandleResourceChange( aType );
 if ( aType == CFsEmailUiViewBase::EScreenLayoutChanged )
 {
 RefreshCurrentMailHeader();
-}
+	    SetRect( iView.ContainerRect() );
 }
+}
 void CFsEmailUiHtmlViewerContainer::RefreshCurrentMailHeader()
 {
 if ( iMessage )
 {
 {
 TRAP_IGNORE( ReloadPageL() );
 }
 else
 {
 //Load page asynchronously after dismissing menu
-iEventHandler->DismissMenuAndReload();
+//this is outdated call because it cancels Action menu which is no longer used in 9.2
+// iEventHandler->DismissMenuAndReload();
 }
 }
 }
 void CFsEmailUiHtmlViewerContainer::ReloadPageL()
 return ETrue;
 }
 else if (aUrl.Compare(KURLDisplayImages()) == 0)
 {
 DisplayStatusIndicatorL(KStatusIndicatorAutomaticHidingDuration);
+			if( iMessage )
+			{
 iAppUi.DisplayImagesCache().AddMessageL(*iMessage);
+			}
 iBrCtlInterface->HandleCommandL(TBrCtlDefs::ECommandLoadImages + TBrCtlDefs::ECommandIdBase);
 return ETrue;
 }
 else if (aUrl.Compare(KURLCollapseHeader()) == 0)
 {
 CleanupStack::PopAndDestroy( handler );
 }
 void CFsEmailUiHtmlViewerContainer::PrepareBodyHtmlL( const TDesC& aFileName )
 {
-CFSMailMessagePart* htmlBodyPart = iMessage->HtmlBodyPartL();
+if( iMessage )
-if ( htmlBodyPart )
+{
-{
+CFSMailMessagePart* htmlBodyPart = iMessage->HtmlBodyPartL();
-CleanupStack::PushL( htmlBodyPart );
-// Copy html body part to email html file
+if ( htmlBodyPart )
-CopyToHtmlFileL( *htmlBodyPart, aFileName );
+{
-CleanupStack::PopAndDestroy( htmlBodyPart );
+CleanupStack::PushL( htmlBodyPart );
-}
-else
-{
-CFSMailMessagePart* textBodyPart = iMessage->PlainTextBodyPartL();
-if ( textBodyPart )
-{
-CleanupStack::PushL( textBodyPart );
 // Copy html body part to email html file
-ConvertToHtmlFileL( *textBodyPart, aFileName );
+CopyToHtmlFileL( *htmlBodyPart, aFileName );
-CleanupStack::PopAndDestroy( textBodyPart );
+CleanupStack::PopAndDestroy( htmlBodyPart );
 }
 else
 {
-User::Leave( KErrNotFound );
+CFSMailMessagePart* textBodyPart = iMessage->PlainTextBodyPartL();
+if ( textBodyPart )
+{
+CleanupStack::PushL( textBodyPart );
+// Copy html body part to email html file
+ConvertToHtmlFileL( *textBodyPart, aFileName );
+CleanupStack::PopAndDestroy( textBodyPart );
+}
+else
+{
+User::Leave( KErrNotFound );
+}
 }
 }
 }
 void CFsEmailUiHtmlViewerContainer::WriteEmptyBodyHtmlL( const TDesC& aFileName )

branch	RCL_3
changeset 12	4ce476e64c59
parent 11	0396474f30f5
child 13	8592a65ad3fb