MCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailclient/src/thumbnailrequestactive.cpp

equal deleted inserted replaced

-:7403edfcf0fb
+:dea39715fc05
 CThumbnailRequestActive::CThumbnailRequestActive( RFs& aFs, RThumbnailSession&
 aThumbnailSession, MThumbnailManagerObserver& aObserver,
 TThumbnailRequestId aId, TInt aPriority, CThumbnailRequestQueue* aQueue ):
 CActive( aPriority ), iSession( aThumbnailSession ), iParamsPckg( iParams ),
 iObserver( aObserver ), iFs( aFs ), iBitmapHandle( 0 ), iRequestId( aId ),
-iRequestQueue( aQueue )
+iRequestQueue( aQueue ), iCanceled( EFalse )
 {
 CActiveScheduler::Add( this );
 TN_DEBUG2( "CThumbnaiRequestActive::CThumbnailRequestActive() AO's priority = %d", Priority());
 iBitmap = NULL;
 break;
 }
 case EReqGetThumbnailHandleLater:
 {
 // open file handle
+iFile.Close();
 User::LeaveIfError( iFile.Open( iFs, iTargetUri, EFileShareReadersOrWriters ) );
 TN_DEBUG2( "CThumbnailRequestActive::StartL() - file handle opened for %S", &iTargetUri );
 CleanupClosePushL( iFile );
 iRequestCompleted = ETrue;
 }
 iTimer->Cancel();
-if (iRequestType == EReqDeleteThumbnails)
+if (iRequestType == EReqDeleteThumbnails || iCanceled)
 {
-// no action for delete
+iFile.Close();
+iMyFileHandle.Close();
+// no action for delete or canceled request
 iRequestQueue->RequestComplete(this);
 #ifdef _DEBUG
 TTime stop;
 stop.UniversalTime();
 TN_DEBUG2( "CThumbnaiRequestActive::RunL() - no thumbnail found - lets try with file handle %S", &iParams.iFileName );
 iRequestCompleted = EFalse;
 // We tried to get thumbnail using file path, but it was not found in
 // the database. We need to open the file now (on the client side) and
 // use file handle.
+iFile.Close();
 TInt err = iFile.Open( iFs, iParams.iFileName, EFileShareReadersOrWriters );
 TN_DEBUG2( "CThumbnaiRequestActive::RunL() - file handle open err = %d", err );
 User::LeaveIfError( err );
 CleanupClosePushL( iFile );
 	    TN_DEBUG2( "CThumbnaiRequestActive::RunL() - iObserver.ThumbnailReady %d", iParams.iRequestId );
 	    iObserver.ThumbnailReady( iStatus.Int(), *iCallbackThumbnail, iParams.iRequestId );
 	    ReleaseServerBitmap();
+	    iFile.Close();
+	    iMyFileHandle.Close();
 	    iRequestQueue->RequestComplete(this);
 #ifdef _DEBUG
 TTime stop;
 stop.UniversalTime();
 iProcessingPreview = EFalse;
 ReleaseServerBitmap();
+iFile.Close();
 //set flags so that EThumbnailGeneratePersistentSizesOnly is done aka check all missing sizes
 iParams.iQualityPreference = CThumbnailManager::EOptimizeForQuality;
 iParams.iControlFlags = EThumbnailGeneratePersistentSizesOnly;
 iRequestType = EReqUpdateThumbnails;
 }
 if ( iProcessingPreview )
 {
 TN_DEBUG2( "CThumbnailRequestActive::RunL() - iObserver.ThumbnailPreviewReady %d", iParams.iRequestId );
-			//increase priority of 2nd round (both, AO and request itself)
+//increase priority of 2nd round (both, AO and request itself)
 this->SetPriority(this->Priority() + 1);
 iParams.iPriority++;
 iObserver.ThumbnailPreviewReady( *iCallbackThumbnail, iParams.iRequestId );
 iProcessingPreview = EFalse;
 ReleaseServerBitmap();
+iFile.Close();
 Get2ndPhaseThumbnailL();
 }
 else
 {
 TN_DEBUG2( "CThumbnailRequestActive::RunL() - iObserver.ThumbnailReady %d", iParams.iRequestId );
 iObserver.ThumbnailReady( iStatus.Int(), * iCallbackThumbnail, iParams.iRequestId );
 ReleaseServerBitmap();
+iFile.Close();
+iMyFileHandle.Close();
 iRequestQueue->RequestComplete(this);
 #ifdef _DEBUG
 TTime stop;
 TN_DEBUG1( "CThumbnailRequestActive::DoCancel");
 iTimer->Cancel();
 __ASSERT_DEBUG(( iRequestId > 0 ), ThumbnailPanic( EThumbnailWrongId ));
+iCanceled = ETrue;
 iSession.CancelRequest( iRequestId );
 ReleaseServerBitmap();
 }
 iError = KErrNone;
 }
 ReleaseServerBitmap();
+iFile.Close();
+iMyFileHandle.Close();
 iRequestCompleted = ETrue;
 iRequestQueue->RequestComplete(this);
 iRequestActive = EFalse;
 }

branch	RCL_3
changeset 9	dea39715fc05
parent 7	2eb74cf6572e
child 10	ee674526fac5