MCL/sf/app/messaging: comparison mmsengine/mmscodec/src/mmsencode.cpp

equal deleted inserted replaced

-:fa1df4b99609
+:ebe688cedc25
 //#define CONTENT_DISPOSITION_TEST
 // INCLUDE FILES
 #include    <e32std.h>
+#include    <e32hal.h>
 #include    <apparc.h>
 #include    <s32mem.h>
 #include    <msventry.h>
 #include    <utf.h>
 #include    <e32math.h>
 TMmsLogger::Log( _L("CMmsEncode::EncodeHeadersChunkedL:: start") );
 #endif /* _NO_MMSS_LOGGING_ */
 User::LeaveIfError( iEntryWrapper->SetCurrentEntry( iCurrentMessageId ) );
 /* Korean req: 415-5434
-* Get the target encoding MIB enum from cenrep and encode MMS text objects using coresponding conversion plugins
+* Get the target encoding MIB enum from cenrep and encode MMS text objects using corresponding conversion plugins
 */
 TInt temp;
 iTargetEncodingType = 0;
 CRepository* repository = CRepository::NewLC( KUidMmsServerMtm );
 if ( repository->Get( KMmsEncodingType, temp ) == KErrNone )
 TMmsLogger::Log( _L("CMmsEncode::EncodeHeadersChunkedL:: target encoding type: %d"), iTargetEncodingType );
 #endif /* _NO_MMSS_LOGGING_ */
 if( iTargetEncodingType != 0 )
 {
+TRAPD( err, PreProcessAttachmentDataL() );
 #ifndef _NO_MMSS_LOGGING_
-TRAPD( err, PreProcessAttachmentDataL() );
 /* if any error, korean specific encoding failed, But this should not stop from sending MMS using
 * existing default encoding. Hence just log the error and continue in any case
 */
 if( err != KErrNone )
 {
 TMmsLogger::Log( _L("CMmsEncode::EncodeHeadersChunkedL:: PreProcessAttachmentDataL error: %d"), err );
 }
-#else
-				TRAP_IGNORE( PreProcessAttachmentDataL() );
 #endif /* _NO_MMSS_LOGGING_ */
 }
 //Open store for read-only purpose
 CMsvStore* store = iEntryWrapper->ReadStoreL();
 if ( iOnlyOneChunk )
 {
 #ifndef _NO_MMSS_LOGGING_
 TMmsLogger::Log( _L("CMmsEncode::EncodeHeadersChunkedL:: only one chunk") );
 #endif /* _NO_MMSS_LOGGING_ */        // The message is small enough to be sent as one chunk
-for ( i = 0; ( i < iNumberOfAttachments ) && ( iError == KErrNone ); i++ )
+for ( i = 0; ( i < iNumberOfAttachments ) && ( iError == KErrNone ); ++i )
 {
 iCurrentAttachment = i;
 // encode attachments, too, as we have decided that our message
 // is small enough to fit into the buffer as one chunk
 // DoEncodeAttachment always encodes iCurrentAttachment
 TMmsLogger::Log( _L("CMmsEncode::EncodeHeadersChunkedL:: Multiple chunks") );
 #endif /* _NO_MMSS_LOGGING_ */        // The message is small enough to be sent as one chunk
 // chunked sending - but it should be possible to calculate data size
 iOverallDataSize = iPosition; // This is the amount taken by headers
 // The message is small enough to be sent as one chunk
-for ( i = 0; ( i < iNumberOfAttachments ) && ( iError == KErrNone ); i++ )
+for ( i = 0; ( i < iNumberOfAttachments ) && ( iError == KErrNone ); ++i )
 {
 iCurrentAttachment = i;
 // encode attachments, too, as we have decided that our message
 // is small enough to fit into the buffer as one chunk
 // DoEncodeAttachment always encodes iCurrentAttachment
 CleanupStack::PopAndDestroy( tempContentType );
 aContentTypeString.Set( aAttachmentInfo.MimeType() );
 }
 TInt8 i;
-for ( i = 0; i < KNumberContentTypes && aContentType < 0; i++ )
+for ( i = 0; i < KNumberContentTypes && aContentType < 0; ++i )
 {
 if ( aContentTypeString.CompareF(
 TPtrC8( KContentTypeTable[i] ) ) == 0 )
 {
 aContentType = i;
 // Extension media
 aHeaderLength += aContentTypeString.Length();
 aHeaderLength += 1; // terminating zero
 }
-// If we have paramters, we must calculate their length.
+// If we have parameters, we must calculate their length.
 if ( iMimeHeaders->MimeCharset() != 0 )
 {
 // charset has well-known encoding
 aHeaderLength += 1;
 if ( iMimeHeaders->MimeCharset() <= KMmsShortIntegerLimit127 )
 }
 }
 }
 if ( ( iMimeHeaders->ContentTypeParams().MdcaCount() % 2 ) == 1 )
 {
-// Odd number. Obviously last paramter has no value.
+// Odd number. Obviously last parameter has no value.
 // Add the "no value" token
 aHeaderLength++;
 }
 // include name parameter to content-type
 {
 // if version is <= 1.2, the filename must be us-ascii
 // replace all illegal characters by underscore
 buf8 = HBufC8::NewL( nameLength );
 CleanupStack::PushL( buf8 );
-for ( j = 0; j < nameLength; j++ )
+for ( j = 0; j < nameLength; ++j )
 {
 oneCharacter.Copy( originalName.Mid( j, 1 ) );
 if ( !IsStringSafe( oneCharacter ) )
 {
 _LIT( KMmsUnderscore, "_" );
 // x-type parameters
 // Must be stored as name/value pairs like content-type parameters
 // X-parameter[i] = parameter name
 // X-parameter[i+1] = parameter value
-for ( i = 0; i < iMimeHeaders->XTypeParams().MdcaCount(); i++ )
+for ( i = 0; i < iMimeHeaders->XTypeParams().MdcaCount(); ++i )
 {
 // If we have corrupted parameters (length of name is zero)
 // we skip the name/value pair.
 // value may be zero, it will be encoded as just the terminating zero
 if ( i%2 == 0 &&
 aHeaderLength += iMimeHeaders->XTypeParams().MdcaPoint( i ).Length() + 1;
 }
 }
 if ( ( iMimeHeaders->XTypeParams().MdcaCount() % 2 ) == 1 )
 {
-// Odd number. Obviously last paramter has no value.
+// Odd number. Obviously last parameter has no value.
 // Add the "no value" token
 aHeaderLength++;
 }
 // THESE ARE NOT IMPLEMENTED
 // but maybe something else, too
 temp = KWspCharset | KMms0x80; // encode as short integer
 EncodeOptionalInteger( temp, iMimeHeaders->MimeCharset() );
-// if we didn't find "Name" parameter among our paramters, we
+// if we didn't find "Name" parameter among our parameters, we
 // put it first.
 // we need the name later anyway...
 if ( !aFoundName )
 // Then the rest of content type parameters, just text strings.
 TInt i = 0;
-for ( i = 0; i < iMimeHeaders->ContentTypeParams().MdcaCount(); i++ )
+for ( i = 0; i < iMimeHeaders->ContentTypeParams().MdcaCount(); ++i )
 {
 // If we have corrupted parameters (length of name is zero)
 // we skip the name/value pair.
 // value may be zero, it will be encoded as just the terminating zero
 if ( i%2 == 0 &&
 }
 }
 }
 if ( ( iMimeHeaders->ContentTypeParams().MdcaCount() % 2 ) == 1 )
 {
-// Odd number. Obviously last paramter has no value.
+// Odd number. Obviously last parameter has no value.
 // Add the "no value" token
 iEncodeBuffer->Write( iPosition, &KMmsNull, 1 );
 iPosition++;
 }
 // filename should be text-string, not quoted
 EncodeHeaderAndTextString( temp, buf8->Des() );
 #endif
 // x-type parameters
-for ( i = 0; i < iMimeHeaders->XTypeParams().MdcaCount(); i++ )
+for ( i = 0; i < iMimeHeaders->XTypeParams().MdcaCount(); ++i )
 {
 // If we have corrupted parameters (length of name is zero)
 // we skip the name/value pair.
 // value may be zero, it will be encoded as just the terminating zero
 if ( i%2 == 0 &&
 EncodeTextString( iMimeHeaders->XTypeParams().MdcaPoint( i ) );
 }
 }
 if ( ( iMimeHeaders->XTypeParams().MdcaCount() % 2 ) == 1 )
 {
-// Odd number. Obviously last paramter has no value.
+// Odd number. Obviously last parameter has no value.
 // Add the "no value" token
 iEncodeBuffer->Write( iPosition, &KMmsNull, 1 );
 iPosition++;
 }
 // previously sent by array
 TInt i;
 TUint oldPosition;
 TUint length;
-for ( i = 0; i < iMmsHeaders->PreviouslySentList().Count(); i++ )
+for ( i = 0; i < iMmsHeaders->PreviouslySentList().Count(); ++i )
 {
 oldPosition = iPosition;
 length = 0;
 // Encode once just to find out filed length
 EncodeInteger( iMmsHeaders->PreviouslySentList()[i]->Order() );
 iMmsHeaders->ReplyChargingId() );
 TInt i;
 TUint oldPosition;
 TUint length;
-for ( i = 0; i < iMmsHeaders->PreviouslySentList().Count(); i++ )
+for ( i = 0; i < iMmsHeaders->PreviouslySentList().Count(); ++i )
 {
 oldPosition = iPosition;
 length = 0;
 // Encode once just to find out field length
 EncodeInteger( iMmsHeaders->PreviouslySentList()[i]->Order() );
 {
 TUint8 character;
 // No need to check if we need a quote - if we are safe, we have
 // no characters >= 128.
-for ( i = 0; i < aString.Length(); i++ )
+for ( i = 0; i < aString.Length(); ++i )
 {
 character = TUint8( aString[i] & KMms0xFF );
 iEncodeBuffer->Write( iPosition, &character, 1 );
 iPosition++;
 }
 TInt64 temp = aLongInteger;
 TInt i = 0;
 TInt64 reminder = 0;
-for ( i = 7; i >= 0; i-- )
+for ( i = 7; i >= 0; --i )
 {
 reminder = temp % 0x100;
 temp = temp / 0x100;
 array[i] = TInt8 ( I64INT( reminder ) ) ;
 }
 temp = temp << KMms8;
 byte = TInt8( ( temp >> KMms24 ) & KMms0xFF );
 }
 TUint i = 0;
-for ( i = 0; i < length; i++ )
+for ( i = 0; i < length; ++i )
 {
 array[i] = TInt8( ( temp >> ( KMms8 * ( KMms3 - i ) ) ) & KMms0xFF );
 }
 // write short length
 // All legal characters present in a phone number are ASCII
 TInt i = 0;
 TUint8 character = 0;
 realAddressPointer = realAddress->Des();
-for ( i = 0; i < realAddress->Length(); i++ )
+for ( i = 0; i < realAddress->Length(); ++i )
 {
 // The array index is safe because i is always < realAddress->Length().
 character = TUint8( realAddressPointer[i] & KMms0xFF );
 iEncodeBuffer->Write( iPosition, &character, 1 );
 iPosition++;
 // No more than 5 bytes will be produced
 TUint8 buffer[KMms5];
 TUint temp = aInteger;
 TInt i;
-for ( i = 0; i < KMms5; i++ )
+for ( i = 0; i < KMms5; ++i )
 {
 buffer[KMms4 - i] = TUint8( temp & KMms0x7F );
 temp >>= KMms7;
 }
 i++;
 }
 TInt j;
-for ( j = i; j < KMms4; j++ )
+for ( j = i; j < KMms4; ++j )
 {
 // buffer indexes are safe because the buffer has been defined long enough.
 buffer[j] |= KMms0x80; // set Continue bit, but never to last
 }
 // No more than 5 bytes will be produced
 TUint8 buffer[KMms5];
 TUint temp = aInteger;
 TInt i;
-for (i = 0; i < KMms5; i++ )
+for (i = 0; i < KMms5; ++i )
 {
 buffer[KMms4 - i] = TUint8( temp & KMms0x7F );
 temp >>= KMms7;
 }
 break;
 default:
 break;
 }
-for ( i = 0; i < size; i++ )
+for ( i = 0; i < size; ++i )
 {
 // check for fakes
 if ( aRecipientList[i].Length() > 0 )
 {
 iEncodeBuffer->Write( iPosition, &recipientType, 1 );
 // Used for headers, which are short strings
 TInt i;
 TBool safe = ETrue;
-for ( i = 0; i < aString.Length() && safe; i++ )
+for ( i = 0; i < aString.Length() && safe; ++i )
 {
 if ( aString[i] < KMmsLowestAscii || aString[i] >= KMmsHighestAscii )
 {
 safe = EFalse;
 }
 TInt i;
 aNumNonSafe = 0;
 TBool safe = ETrue;
-for ( i = 0; i < aString.Length()/* && safe*/; i++ )
+for ( i = 0; i < aString.Length()/* && safe*/; ++i )
 {
 if ( aString[i] < KMmsLowestAscii || aString[i] >= KMmsHighestAscii )
 {
 safe = EFalse;
 aNumNonSafe++;
 }
 // Check if we have well-known media.
 TInt8 rootContentType = -1;
 TInt8 i = 0;
-for ( i = 0; i < KNumberContentTypes && rootContentType < 0; i++ )
+for ( i = 0; i < KNumberContentTypes && rootContentType < 0; ++i )
 {
 if ( contentTypeString.CompareF( TPtrC8( KContentTypeTable[i] ) ) == 0 )
 {
 rootContentType = i;
 }
 TInt i = 0;
 TInt length = 0;
 // caller must check that iMmsHeaders->ReadOnlyMMBoxMessageHeaders() is not NULL
 CMmsMMBoxMessageHeaders& temp = iMmsHeaders->MMBoxMessageHeadersL();
-for ( i = 0; i < temp.KeywordArray().Count(); i++ )
+for ( i = 0; i < temp.KeywordArray().Count(); ++i )
 {
 length = temp.KeywordArray()[i]->Keyword().Length();
 if ( length > 0 )
 {
 iEncodeBuffer->Write( iPosition, &KMmsAssignedMMFlags, 1 );
 //
 void CMmsEncode::EncodeAttributes( RArray<TUint>& aAttributeArray )
 {
 TInt i;
-for ( i = 0; i < aAttributeArray.Count(); i++ )
+for ( i = 0; i < aAttributeArray.Count(); ++i )
 {
 EncodeMandatoryByte( KMmsAssignedAttributes, aAttributeArray[i] );
 }
 }
 //
 void CMmsEncode::EncodeMMBoxStates( RArray<TInt>& aStateArray )
 {
 TInt i;
-for ( i = 0; i < aStateArray.Count(); i++ )
+for ( i = 0; i < aStateArray.Count(); ++i )
 {
 EncodeMandatoryByte( KMmsAssignedMMState, aStateArray[i] );
 }
 }
 retVal = CheckAndUpdateAttachmentL(*attachmentInfo, *iMimeHeaders);
 if( retVal )
 {
+TRAPD(
+err,
+attachManagerSync.ModifyAttachmentInfoL(attachmentInfo);
+editStore->CommitL();
+);
 #ifndef _NO_MMSS_LOGGING_
-TRAPD( err,attachManagerSync.ModifyAttachmentInfoL(attachmentInfo);
-editStore->CommitL(););
 if(err != KErrNone)
 {
 TMmsLogger::Log( _L("CMmsEncode::PreProcessAttachmentData:: store commit error: %d"), err );
 }
 else
 {
 TMmsLogger::Log( _L("CMmsEncode::PreProcessAttachmentData:: store commit success") );
 }
-#else
-				    TRAP_IGNORE( attachManagerSync.ModifyAttachmentInfoL(attachmentInfo);
-editStore->CommitL(););
 #endif /* _NO_MMSS_LOGGING_ */
-/*  attachmentInfo ownership is transfered to attachment manager
+/*  attachmentInfo ownership is transferred to attachment manager
 *  Hence, JUST pop attachmentInfo, DO NOT Destroy.
 */
 CleanupStack::Pop( attachmentInfo );
 }
 else
 }
 // ---------------------------------------------------------
 // CMmsEncode::ProcessAndConvertAttachmentDataL
 // converts of attachment data from source to target encoding type.
-// |src charset buffer| --->coverted to ---> |unicode buffer| ---> converted to ---> |target charset|
+// |src charset buffer| --->converted to ---> |unicode buffer| ---> converted to ---> |target charset|
 // Returns false if data is already int target format, or plugins are missing, or file operation issues.
 // ---------------------------------------------------------
 TBool CMmsEncode::ProcessAndConvertAttachmentDataL( TUint aSrcCharSetMIBEnum,
 TUint aTargetCharSetMIBEnum,
 CMsvAttachment& aAttachmentInfo)

branch	RCL_3
changeset 26	ebe688cedc25
parent 12	caea42e26caa
child 27	7fdbb852d323