diff -r debf68073f2f -r 142dacf7b30e mtpfws/mtpfw/dataproviders/dputility/src/cmtpsendobjectinfo.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsendobjectinfo.cpp Wed Sep 15 13:07:27 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsendobjectinfo.cpp Wed Oct 13 15:29:02 2010 +0300 @@ -100,8 +100,7 @@ @param aConnection The connection from which the request comes */ CMTPSendObjectInfo::CMTPSendObjectInfo(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : - CMTPRequestProcessor(aFramework, aConnection, 0, NULL), - iHiddenStatus( EMTPVisible ) + CMTPRequestProcessor(aFramework, aConnection, 0, NULL) { } @@ -661,15 +660,14 @@ if (!iIsFolder) { + delete iFileReceived; + iFileReceived = NULL; TEntry fileEntry; User::LeaveIfError(iFramework.Fs().Entry(iFullPath, fileEntry)); if (fileEntry.FileSize() != iObjectSize) { - delete iFileReceived; - iFileReceived = NULL; - iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); iFramework.Fs().Delete(iFullPath); @@ -715,8 +713,6 @@ if(!iIsFolder) { SetPropertiesL(); - delete iFileReceived; - iFileReceived = NULL; iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObject); iFullPath.LowerCase(); __FLOG_VA((_L8("File Name %S"), &iFullPath)); @@ -943,9 +939,6 @@ case EMTPObjectPropCodeName: iName = aElement.StringL(CMTPTypeObjectPropListElement::EValue); break; - case EMTPObjectPropCodeHidden: - iHiddenStatus = aElement.Uint16L(CMTPTypeObjectPropListElement::EValue); - break; default: break; } @@ -1038,7 +1031,6 @@ break; case EMTPObjectPropCodeAssociationType: - case EMTPObjectPropCodeHidden: if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeUINT16) { responseCode = EMTPRespCodeInvalidObjectPropFormat; @@ -1207,7 +1199,6 @@ void CMTPSendObjectInfo::SetPropertiesL() { __FLOG(_L8("SetPropertiesL - Entry")); - TEntry entry; User::LeaveIfError(iFramework.Fs().Entry(iFullPath, entry)); @@ -1244,42 +1235,14 @@ { entry.iAtt |= KEntryAttReadOnly; } - if ( iFileReceived ) - { - User::LeaveIfError(iFileReceived->File().SetAtt(entry.iAtt, ~entry.iAtt)); - } - else - { - User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt)); - } + User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt)); } - - if ( EMTPHidden == iHiddenStatus ) - { - entry.iAtt &= ~KEntryAttHidden; - entry.iAtt |= KEntryAttHidden; - if ( iFileReceived ) - { - User::LeaveIfError(iFileReceived->File().SetAtt(entry.iAtt, ~entry.iAtt)); - } - else - { - User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt)); - } - } - + if(iDateMod != NULL && iDateMod->Length()) { TTime modifiedTime; iDpSingletons.MTPUtility().MTPTimeStr2TTime(*iDateMod, modifiedTime); - if ( iFileReceived ) - { - User::LeaveIfError(iFileReceived->File().SetModified( modifiedTime )); - } - else - { - User::LeaveIfError(iFramework.Fs().SetModified(iFullPath, modifiedTime)); - } + User::LeaveIfError(iFramework.Fs().SetModified(iFullPath, modifiedTime)); } iReceivedObject->SetDesCL(CMTPObjectMetaData::EName, iName);