FCL/sf/app/photos: comparison photosgallery/viewframework/medialists/src/glxcachemanager.cpp

equal deleted inserted replaced

-:4e91876724a2
+:9ba538e329bd
 #include <thumbnaildata.h>
 const TInt KMaxGridThumbnailWidth = 200;
 _LIT(KFileIdentifier, ":\\");
 #endif
+_LIT(KDefaultType, "image/jpg");
 /// How long to wait before rechecking for cleared temporary errors
 /// @todo Find optimal value for this
 const TInt KGlxTemporaryErrorRecheckPeriodInSeconds = 5;
 const TInt KGlxLowerMemoryLimitForCleanUp = 15000000;
 GLX_DEBUG1("MaintainCacheL() - Fetch TN attrib - EOptimizeForQualityWithPreview");
 }
 if (list->Collection().UidL().iUid == KGlxCollectionPluginImageViewerImplementationUid)
 {
-RDebug::Printf("void CGlxCacheManager::MaintainCacheL:ABC: IV TN");
 _LIT( KPrivateFolder, "\\Private\\" );    // Platsec private folder
 TParsePtrC parse( item.Uri() );
 if( parse.PathPresent() &&
 parse.Path().Length() > KPrivateFolder().Length() &&
 parse.Path().Left( KPrivateFolder().Length() ).CompareF( KPrivateFolder ) == 0 )
 {
-RDebug::Printf("void CGlxCacheManager::MaintainCacheL:ABC: In if");
 GLX_DEBUG1("KGlxCollectionPluginImageViewerImplementationUid - Fetch (Private) TN!");
 CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(iImageViewerInstance->ImageFileHandle());
 iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId));
-CleanupStack::PopAndDestroy();
+CleanupStack::PopAndDestroy(source);
 }
 else
 {
-RDebug::Printf("void CGlxCacheManager::MaintainCacheL:ABC: In else");
 GLX_DEBUG1("KGlxCollectionPluginImageViewerImplementationUid - Fetch TN!");
 CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(item.Uri(), 0);
 iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId));
-CleanupStack::PopAndDestroy();
+CleanupStack::PopAndDestroy(source);
 }
 }
 else
 {
 #ifdef MEDIA_ID_BASED_TN_FETCH_ENABLED
 						    iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(itemId.Value()), spaceId, tnSize, itemId));
 #else
 						    CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(item.Uri(), 0);
 						    iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId));
-						    CleanupStack::PopAndDestroy();
+						    CleanupStack::PopAndDestroy(source);
 #endif
 }
 		                    iThumbnailId = itemId;
 							}
 						else
 	                // Use list's isolated collection
 	                MMPXCollection& collection = list->Collection();
 if (collection.UidL().iUid == KGlxCollectionPluginImageViewerImplementationUid)
 {
 TInt mediaCnt = list->Count();
+TInt errInImage = KErrNone;
 GLX_DEBUG3("Image Viewer Collection - Attrib population! mediaCnt=%d, Media Id=%d",
 mediaCnt, itemId.Value());
 delete iMPXMedia;
 iMPXMedia = NULL;
 TFileName fileName;
-fileName.Append(iImageViewerInstance->ImageUri()->Des());
+//retrieve the filename as per the caller app.
+						if(!iImageViewerInstance->IsPrivate())
+{
+							//filemngr
+fileName.Append(iImageViewerInstance->ImageUri()->Des());
+}
+else
+{
+							//msging
+fileName.Append(iImageViewerInstance->ImageFileHandle().FullName(fileName));
+}
 iMPXMedia = CMPXMedia::NewL();
 if(!iReader)
 {
-iReader = CGlxImageReader::NewL(*this);
+TRAP(errInImage,iReader = CGlxImageReader::NewL(*this));
-iSchedulerWait->Start();
+if(errInImage == KErrNone)
+{
+iSchedulerWait->Start();
+}
 }
 for ( TInt i = 0; i < iRequestedAttrs.Count(); i++ )
 {
 if ( iRequestedAttrs[i] == KMPXMediaGeneralId )
 {
 iMPXMedia->SetTObjectValueL<TMPXItemId>(KMPXMediaGeneralId,
 time.HomeTime();
 iMPXMedia->SetTObjectValueL(KGlxMediaGeneralLastModifiedDate, time.Int64());
 }
 else if ( iRequestedAttrs[i] == KMPXMediaGeneralSize )
 {
-iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, 1000);
+				if(errInImage == KErrNone)
+					{
+					RFs fs;
+					TInt err = fs.Connect();
+					if(err == KErrNone)
+				    	{
+						TEntry entry;
+	fs.Entry(fileName,entry);
+						TInt sz;
+						sz = entry.iSize;
+						fs.Close();
+						iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, sz);
+						}
+					else
+				    	{
+						iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, 0);
+						}
+					}
+// If any error while image is being decoded by image decorder, Need to set
+// default vaule for that image. Typical case is corrupted image.
+else
+{
+iMPXMedia->SetTObjectValueL(KMPXMediaGeneralSize, 0);
+}
 }
 else if ( iRequestedAttrs[i] == KMPXMediaGeneralDrive )
 {
 TParsePtrC parser(fileName);
 iMPXMedia->SetTextValueL(KMPXMediaGeneralDrive, parser.Drive());
 }
 else if ( iRequestedAttrs[i] == KMPXMediaGeneralMimeType )
 {
-TDataType dataType;
+if(errInImage == KErrNone)
-GetMimeType(fileName, dataType);
+{
-iMPXMedia->SetTextValueL(KMPXMediaGeneralMimeType, dataType.Des());
+TDataType dataType;
+GetMimeType(fileName, dataType);
+iMPXMedia->SetTextValueL(KMPXMediaGeneralMimeType, dataType.Des());
+}
+else
+{
+iMPXMedia->SetTextValueL(KMPXMediaGeneralMimeType, KDefaultType);
+}
 }
 else if ( iRequestedAttrs[i] == KMPXMediaGeneralDuration )
 {
 iMPXMedia->SetTObjectValueL(KMPXMediaGeneralDuration, 0);
 }
 {
 iMPXMedia->SetTObjectValueL(KGlxMediaGeneralSystemItem, EFalse);
 }
 else if ( iRequestedAttrs[i] == KGlxMediaGeneralDimensions )
 {
-//need to fetch the original file dimensions
+if(errInImage == KErrNone)
-TSize dimensions(iImgSz.iWidth,iImgSz.iHeight);
+{
+//need to fetch the original file dimensions
-iMPXMedia->SetTObjectValueL(KGlxMediaGeneralDimensions, dimensions);
+TSize dimensions(iImgSz.iWidth,iImgSz.iHeight);
+iMPXMedia->SetTObjectValueL(KGlxMediaGeneralDimensions, dimensions);
+}
+else
+{
+TSize dimensions(0,0);
+iMPXMedia->SetTObjectValueL(KGlxMediaGeneralDimensions, dimensions);
+}
 }
 else if ( iRequestedAttrs[i] == KGlxMediaGeneralFramecount )
 {
 TInt fcount = 1;
 iMPXMedia->SetTObjectValueL(KGlxMediaGeneralFramecount, fcount);
 User::LeaveIfError( session.Connect() );
 CleanupClosePushL( session );
 TUid uid;
 User::LeaveIfError( session.AppForDocument( aFileName, uid, aMimeType ) );
-CleanupStack::PopAndDestroy(); // session
+CleanupStack::PopAndDestroy(&session);
 }
 void CGlxCacheManager::ImageReadyL(const TInt& aError, const TSize aSz)
 {
 if(iSchedulerWait)

changeset 1	9ba538e329bd
parent 0	4e91876724a2
child 2	7d9067c6fcb1