equal
deleted
inserted
replaced
1106 } |
1106 } |
1107 } |
1107 } |
1108 |
1108 |
1109 if ( result && ( iObjectFormat != MmMtpDpUtility::FormatFromFilename( iFullPath ) ) ) |
1109 if ( result && ( iObjectFormat != MmMtpDpUtility::FormatFromFilename( iFullPath ) ) ) |
1110 { |
1110 { |
1111 PRINT2( _L( "MM MTP <> %S does not match 0x%x" ), &iFullPath, iObjectFormat ); |
1111 TParsePtrC file( aFileName ); |
1112 result = EFalse; |
1112 if ( ( iObjectFormat == EMTPFormatCode3GPContainer ) && (file.Ext().CompareF( KTxtExtensionODF ) == 0)) |
|
1113 { |
|
1114 PRINT( _L( "MM MTP <> might happen if function is called before physical file arrives" ) ); |
|
1115 // might happen if function is called before physical file arrives |
|
1116 // do nothing |
|
1117 } |
|
1118 else |
|
1119 { |
|
1120 PRINT2( _L( "MM MTP <> %S does not match 0x%x" ), &iFullPath, iObjectFormat ); |
|
1121 result = EFalse; |
|
1122 } |
1113 } |
1123 } |
1114 |
1124 |
1115 PRINT1( _L( "MM MTP <= CSendObject::GetFullPathNameL result = %d" ), result ); |
1125 PRINT1( _L( "MM MTP <= CSendObject::GetFullPathNameL result = %d" ), result ); |
1116 |
1126 |
1117 return result; |
1127 return result; |
1320 // ----------------------------------------------------------------------------- |
1330 // ----------------------------------------------------------------------------- |
1321 // |
1331 // |
1322 void CSendObject::Rollback() |
1332 void CSendObject::Rollback() |
1323 { |
1333 { |
1324 // Delete this object from file system. |
1334 // Delete this object from file system. |
1325 if ( iProgress == ESendObjectInProgress |
1335 if ( iProgress == ESendObjectInProgress ) |
1326 || iProgress == EObjectInfoSucceed |
1336 // || iProgress == EObjectInfoSucceed // this line is to be commented out until SetSize is done in SendObjectInfo/SendObjectPropList |
1327 ||iProgress == EObjectInfoFail ) |
1337 //||iProgress == EObjectInfoFail ) |
1328 { |
1338 { |
1329 PRINT1( _L( "MM MTP <> CSendObject::Rollback ROLLBACK_FILE %S" ), &iFullPath ); |
1339 PRINT1( _L( "MM MTP <> CSendObject::Rollback ROLLBACK_FILE %S" ), &iFullPath ); |
1330 // Close the interrupted transfer file by delete iFileReceived object |
1340 // Close the interrupted transfer file by delete iFileReceived object |
1331 delete iFileReceived; |
1341 delete iFileReceived; |
1332 iFileReceived = NULL; |
1342 iFileReceived = NULL; |