diff -r d881023c13eb -r cbb1bfb7ebfb mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Mon May 03 12:58:40 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Fri May 14 16:21:14 2010 +0300 @@ -1108,8 +1108,18 @@ if ( result && ( iObjectFormat != MmMtpDpUtility::FormatFromFilename( iFullPath ) ) ) { - PRINT2( _L( "MM MTP <> %S does not match 0x%x" ), &iFullPath, iObjectFormat ); - result = EFalse; + TParsePtrC file( aFileName ); + if ( ( iObjectFormat == EMTPFormatCode3GPContainer ) && (file.Ext().CompareF( KTxtExtensionODF ) == 0)) + { + PRINT( _L( "MM MTP <> might happen if function is called before physical file arrives" ) ); + // might happen if function is called before physical file arrives + // do nothing + } + else + { + PRINT2( _L( "MM MTP <> %S does not match 0x%x" ), &iFullPath, iObjectFormat ); + result = EFalse; + } } PRINT1( _L( "MM MTP <= CSendObject::GetFullPathNameL result = %d" ), result ); @@ -1322,9 +1332,9 @@ void CSendObject::Rollback() { // Delete this object from file system. - if ( iProgress == ESendObjectInProgress - || iProgress == EObjectInfoSucceed - ||iProgress == EObjectInfoFail ) + if ( iProgress == ESendObjectInProgress ) + // || iProgress == EObjectInfoSucceed // this line is to be commented out until SetSize is done in SendObjectInfo/SendObjectPropList + //||iProgress == EObjectInfoFail ) { PRINT1( _L( "MM MTP <> CSendObject::Rollback ROLLBACK_FILE %S" ), &iFullPath ); // Close the interrupted transfer file by delete iFileReceived object