FCL/sf/mw/mmappfw: comparison mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cmoveobject.cpp

equal deleted inserted replaced

-:bee149131e4b
+:05b0d2323768
 TParsePtrC fileNameParser( suid );
 if ( ( newObjectName.Length() + fileNameParser.NameAndExt().Length() )
 <= newObjectName.MaxLength() )
 {
 newObjectName.Append( fileNameParser.NameAndExt() );
-}
+responseCode = CanMoveObjectL( suid, newObjectName );
-responseCode = CanMoveObjectL( suid, newObjectName );
+if ( responseCode == EMTPRespCodeOK )
-if ( responseCode == EMTPRespCodeOK )
+MoveFileL( newObjectName );
-MoveFileL( newObjectName );
+}
+else
+// Destination is not appropriate for the full path name shouldn't be longer than 255
+responseCode = EMTPRespCodeInvalidDataset;
 SendResponseL( responseCode );
 CleanupStack::PopAndDestroy( &newObjectName ); // - newObjectName
 if ( iStorageId == iObjectInfo->Uint( CMTPObjectMetaData::EStorageId ) )
 iSameStorage = ETrue;
 else
 iSameStorage = EFalse;
+// Move the file first no matter if it will fail in Get/SetPreviousPropertiesL
+// Already trapped inside
 GetPreviousPropertiesL( *iObjectInfo );
-SetPropertiesL( oldFileName, aNewFileName );
+TRAPD( err, SetPropertiesL( oldFileName, aNewFileName ) );
 CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() );
-CleanupStack::PushL( fileMan );
+err = fileMan->Move( oldFileName, aNewFileName );
-User::LeaveIfError( fileMan->Move( oldFileName, aNewFileName ) );
-CleanupStack::PopAndDestroy( fileMan );
+if ( err != KErrNone )
+PRINT1( _L( "MM MTP <> CMoveObject::MoveFileL err = %d" ), err );
-User::LeaveIfError( iFramework.Fs().SetModified( aNewFileName,
-iPreviousModifiedTime ) );
 PRINT( _L( "MM MTP <= CMoveObject::MoveFileL" ) );
 }
 // -----------------------------------------------------------------------------
 void CMoveObject::GetPreviousPropertiesL( const CMTPObjectMetaData& aObject )
 {
 PRINT( _L( "MM MTP => CMoveObject::GetPreviousPropertiesL" ) );
 const TDesC& suid( aObject.DesC( CMTPObjectMetaData::ESuid ) );
-User::LeaveIfError( iFramework.Fs().Modified( suid, iPreviousModifiedTime ) );
 // same storage, not necessary to get the properties
 if ( iSameStorage )
 return;
 {
 iPropertyElement = &( iPropertyList->ReservePropElemL( handle, propCode ) );
 iPropertyElement->SetStringL( CMTPTypeObjectPropListElement::EValue,
 textData->StringChars() );
 }
-else if ( err == KErrNotFound )
+else
 {
 iPropertyElement = NULL;
-}
-else
-{
-User::Leave( err );
 }
 CleanupStack::PopAndDestroy( textData ); // - textData
 }
 break;
 break;
 case EMTPObjectPropCodeNonConsumable:
 iObjectInfo->SetUint( CMTPObjectMetaData::ENonConsumable,
 element.Uint8L( CMTPTypeObjectPropListElement::EValue ) );
+iFramework.ObjectMgr().ModifyObjectL( *iObjectInfo );
 break;
 case EMTPObjectPropCodeName:
 {
 CMTPTypeString *stringData = CMTPTypeString::NewLC( element.StringL( CMTPTypeObjectPropListElement::EValue ) ); // + stringData
-respcode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapperL( iDpConfig,
+respcode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
 propertyCode,
 *stringData,
 *iObjectInfo );
 CleanupStack::PopAndDestroy( stringData ); // - stringData
 break;
 }
 } // end of for loop
 // ignore errors
+if (respcode == EMTPRespCodeOK)
+{
+// do nothing, just to get rid of build warning
+}
 PRINT1( _L( "MM MTP <= CMoveObject::SetPreviousPropertiesL respcode = 0x%x" ), respcode );
 }
 // -----------------------------------------------------------------------------
 const TDesC& aNewFileName )
 {
 PRINT2( _L( "MM MTP => CMoveObject::SetPropertiesL aOldFileName = %S, aNewFileName = %S" ),
 &aOldFileName,
 &aNewFileName );
 iObjectInfo->SetDesCL( CMTPObjectMetaData::ESuid, aNewFileName );
 iObjectInfo->SetUint( CMTPObjectMetaData::EStorageId, iStorageId );
 iObjectInfo->SetUint( CMTPObjectMetaData::EParentHandle, iNewParentHandle );
+iFramework.ObjectMgr().ModifyObjectL( *iObjectInfo );
 TUint32 formatCode = iObjectInfo->Uint( CMTPObjectMetaData::EFormatCode );
 if ( formatCode == EMTPFormatCodeAbstractAudioVideoPlaylist )
 {
 // This is used to keep the same behavior in mass storage and device file manager.
 PRINT( _L( "MM MTP <> CMoveObject::SetPropertiesL Playlist file do not update the MPX DB" ) );
 }
 else
+// TODO: Need rollback mechanism for consistant with image dp in fw.
+// Not sure if it should be trap if something wrong with MPX db.
 {
 if ( iSameStorage )
+{
 iDpConfig.GetWrapperL().RenameObjectL( aOldFileName, aNewFileName );
-// if the two object in different storage, we should delete the old one and insert new one
+}
-else
+else    // if the two object in different storage, we should delete the old one and insert new one
 {
 iDpConfig.GetWrapperL().DeleteObjectL( aOldFileName, formatCode );
 TUint32 subFormatCode = iObjectInfo->Uint( CMTPObjectMetaData::EFormatSubCode );
 iDpConfig.GetWrapperL().AddObjectL( aNewFileName,
 formatCode,
 subFormatCode );
+// Only leave when getting proplist element from data received by fw.
+// It should not happen after ReceiveDataL in which construction of proplist already succeed.
 SetPreviousPropertiesL();
 }
 }
-iFramework.ObjectMgr().ModifyObjectL( *iObjectInfo );
 // It's not necessary to change references of playlists since Reference DB is used PUID
 PRINT( _L( "MM MTP <= CMoveObject::SetPropertiesL" ) );
 }

branch	RCL_3
changeset 14	05b0d2323768
parent 9	bee149131e4b
child 17	780c925249c1