diff -r dbfb5e38438b -r 305818acdca4 activityfw/storage/common/src/afentry.cpp --- a/activityfw/storage/common/src/afentry.cpp Wed Aug 18 10:39:24 2010 +0300 +++ b/activityfw/storage/common/src/afentry.cpp Mon Sep 13 13:26:33 2010 +0300 @@ -55,6 +55,7 @@ CAfEntry* CAfEntry::NewL(TInt flags, TInt applicationId, const TDesC &activityId, + const TDesC &customActivityName, const TDesC &imgSrc, const TDesC8 &privateData, const TDesC8 &publicData) @@ -62,6 +63,7 @@ CAfEntry* self = CAfEntry::NewLC(flags, applicationId, activityId, + customActivityName, imgSrc, privateData, publicData); @@ -83,6 +85,7 @@ CAfEntry* CAfEntry::NewLC(TInt flags, TInt applicationId, const TDesC &activityId, + const TDesC &customActivityName, const TDesC &imgSrc, const TDesC8 &privateData, const TDesC8 &publicData) @@ -91,6 +94,7 @@ self->ConstructL(flags, applicationId, activityId, + customActivityName, imgSrc, privateData, publicData); @@ -133,6 +137,7 @@ void CAfEntry::ConstructL(TInt flags, TInt applicationId, const TDesC &activityId, + const TDesC &customActivityName, const TDesC &imgSrc, const TDesC8 &privateData, const TDesC8 &publicData) @@ -140,6 +145,7 @@ mFlags = flags; mAppId = applicationId; CopyL(mActivityId, activityId); + CopyL(mCustomActivityName, customActivityName); CopyL(mImgSrc, imgSrc); CopyL(mPrivateData, privateData); CopyL(mPublicData, publicData); @@ -152,6 +158,7 @@ CAfEntry::~CAfEntry() { mActivityId.Close(); + mCustomActivityName.Close(); mPrivateData.Close(); mPublicData.Close(); mImgSrc.Close(); @@ -164,8 +171,9 @@ */ TInt CAfEntry::Size() const { - return (sizeof(TInt) * 3) + //flags + appId + actId size info + return (sizeof(TInt) * 4) + //flags + appId + actId size info + customActivityName size info mActivityId.Size() + //actId content size + mCustomActivityName.Size() + // customActivityName content size DataSize(); //data size } @@ -192,6 +200,7 @@ stream.WriteInt32L(mFlags); stream.WriteInt32L(mAppId); ExternalizeL(stream, mActivityId); + ExternalizeL(stream, mCustomActivityName); ExternalizeDataOnlyL(stream); } @@ -205,6 +214,7 @@ mFlags = stream.ReadInt32L(); mAppId = stream.ReadInt32L(); InternalizeL(mActivityId, stream); + InternalizeL(mCustomActivityName, stream); InternalizeDataOnlyL(stream); } @@ -266,6 +276,16 @@ // ----------------------------------------------------------------------------- /** + * Provide access to activity custom name. + * @return activity custom name + */ +const TDesC& CAfEntry::CustomActivityName() const +{ + return mCustomActivityName; +} + +// ----------------------------------------------------------------------------- +/** * Provide access to activity data. * @param rights - type of requested data * @return activity data