equal
deleted
inserted
replaced
846 iFileReceived = NULL; |
846 iFileReceived = NULL; |
847 TInt err = iFramework.Fs().Delete(iFullPath); |
847 TInt err = iFramework.Fs().Delete(iFullPath); |
848 if (err != KErrNone) |
848 if (err != KErrNone) |
849 { |
849 { |
850 //add Suid to deleteobjectlist |
850 //add Suid to deleteobjectlist |
851 iDataProvider.AppendDeleteObjectsArrayL(iFullPath); |
851 TRAP_IGNORE(iDataProvider.AppendDeleteObjectsArrayL(iFullPath)); |
852 } |
852 } |
853 } |
853 } |
854 |
854 |
855 void CMTPImageDpSendObjectInfo::RemoveObjectFromDb() |
855 void CMTPImageDpSendObjectInfo::RemoveObjectFromDb() |
856 { |
856 { |
1164 if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeUINT32) |
1164 if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeUINT32) |
1165 { |
1165 { |
1166 responseCode = EMTPRespCodeInvalidObjectPropFormat; |
1166 responseCode = EMTPRespCodeInvalidObjectPropFormat; |
1167 } |
1167 } |
1168 break; |
1168 break; |
|
1169 case EMTPObjectPropCodeRepresentativeSampleData: |
|
1170 if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeAUINT8) |
|
1171 { |
|
1172 responseCode = EMTPRespCodeInvalidObjectPropFormat; |
|
1173 } |
|
1174 break; |
1169 case EMTPObjectPropCodeNonConsumable: |
1175 case EMTPObjectPropCodeNonConsumable: |
1170 if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeUINT8) |
1176 if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeUINT8) |
1171 { |
1177 { |
1172 responseCode = EMTPRespCodeInvalidObjectPropFormat; |
1178 responseCode = EMTPRespCodeInvalidObjectPropFormat; |
1173 } |
1179 } |
1186 sends a success response. |
1192 sends a success response. |
1187 */ |
1193 */ |
1188 void CMTPImageDpSendObjectInfo::ReserveObjectL() |
1194 void CMTPImageDpSendObjectInfo::ReserveObjectL() |
1189 { |
1195 { |
1190 __FLOG(_L8("CMTPImageDpSendObjectInfo::ReserveObjectL - Entry")); |
1196 __FLOG(_L8("CMTPImageDpSendObjectInfo::ReserveObjectL - Entry")); |
1191 |
1197 const TInt objectStatusBitmask = 0x8000;//the most significant bit represents importing flag |
|
1198 |
|
1199 iReceivedObject->SetUint(CMTPObjectMetaData::EFormatSubCode, objectStatusBitmask);//mark object imported due to it sent by PC |
1192 iReceivedObject->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); |
1200 iReceivedObject->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); |
1193 iFramework.ObjectMgr().ReserveObjectHandleL(*iReceivedObject, iObjectSize); |
1201 iFramework.ObjectMgr().ReserveObjectHandleL(*iReceivedObject, iObjectSize); |
1194 |
1202 |
1195 // prepare for rollback |
1203 // prepare for rollback |
1196 iRollbackList.Append(UnreserveObject); |
1204 iRollbackList.Append(UnreserveObject); |