--- a/photosgallery/viewframework/dataprovider/src/glxthumbnailvarianttype.cpp Fri Mar 12 15:42:44 2010 +0200
+++ b/photosgallery/viewframework/dataprovider/src/glxthumbnailvarianttype.cpp Mon Mar 15 12:40:30 2010 +0200
@@ -122,7 +122,8 @@
{
GLX_DEBUG1("GlxThumbnailVariantType::CreateAnimatedGifTextureL");
TRAP( err, mTextureId = iUiUtility->GlxTextureManager().
- CreateAnimatedGifTextureL( uri, aSize ).Id() );
+ CreateAnimatedGifTextureL( uri, aSize, aMedia,
+ aMedia.IdSpaceId() ).Id() );
}
//URI length could be zero for Media Id based Thumbnail fetch
else if ( fsTnmAvailable )
@@ -131,21 +132,34 @@
TMPXGeneralCategory cat = aMedia.Category();
if(drm)
{
- expired = iDrmUtility->CheckOpenRightsL(uri, (cat == EMPXImage));
+
+ //Fix for ESLM-82WJ59: call 'CheckDisplayRightsL' only for focused item
+ if(aIsFocused)
+ {
+ expired = !iDrmUtility->CheckDisplayRightsL(uri, (cat == EMPXImage));
+ }
+ else
+ {
+ //Fix for ESLM-82WJ59: for validity check of non-focused item
+ expired = !iDrmUtility->CheckOpenRightsL(uri, (cat == EMPXImage));
+ }
+
+ //Fix for ESLM-82WJ59: mush easier to understand.
if( expired )
{
- if ( isValid )
- {
- // Fix for EABI-7RL9DD
- // Replaced defaultSize with aSize
- TRAP( err, mTextureId = iUiUtility->GlxTextureManager().CreateThumbnailTextureL(
- aMedia, aMedia.IdSpaceId(), aSize, this ).Id() );
- }
+ TRAP( err, mTextureId = iUiUtility->GlxTextureManager().CreateIconTextureL(
+ EMbmGlxiconsQgn_prop_image_notcreated, resFile, defaultSize ).Id() );
}
else
{
- TRAP( err, mTextureId = iUiUtility->GlxTextureManager().CreateIconTextureL(
- EMbmGlxiconsQgn_prop_image_notcreated, resFile, defaultSize ).Id() );
+ if ( isValid == EGlxDrmRightsValid)
+ {
+ // Fix for EABI-7RL9DD
+ // Replaced defaultSize with aSize
+ TRAP( err, mTextureId = iUiUtility->GlxTextureManager().CreateThumbnailTextureL(
+ aMedia, aMedia.IdSpaceId(), aSize, this ).Id() );
+ }
+
}
}
else
@@ -175,7 +189,7 @@
//Have to relook at this.
if(origSize.iWidth > defaultSize.iWidth && origSize.iHeight > defaultSize.iHeight)
{
- GLX_DEBUG1("GlxThumbnailVariantType::CreateIconTextureL::ScaledTnm");
+ GLX_DEBUG1("GlxThumbnailVariantType::CreateThumbnailTextureL::ScaledTnm");
TRAP( err, mTextureId = iUiUtility->GlxTextureManager().CreateThumbnailTextureL(
aMedia, aMedia.IdSpaceId(), aSize, this, ETrue ).Id() );
if(err == KErrNone)
@@ -218,7 +232,6 @@
TBool drmRightsChecked = EFalse;
// minimum size (111 x 83)
TInt minSize = KGlxThumbnailDrmWidth * KGlxThumbnailDrmHeight;
- //TInt minSize = 111*83 ;
// size of actual image
TInt imgSize = aImageSize.iWidth * aImageSize.iHeight;
@@ -326,7 +339,6 @@
if ( iUiUtility)
{
-// iUiUtility->GlxTextureManager().RemoveTexture( mTextureId );
iUiUtility->Close ();
}
}
@@ -453,7 +465,6 @@
TRACER("GlxIconVariantType::~GlxIconVariantType");
if ( iUiUtility)
{
-// iUiUtility->GlxTextureManager().RemoveTexture( mTextureId );
iUiUtility->Close ();
}
}