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

equal deleted inserted replaced

-:7197e789b953
+:ffa62e555b02
 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 );
 else
 {
 iSession.DeleteThumbnails( iParams.iThumbnailId, iParamsPckg, iStatus );
 }
 break;
 }
+case EReqRenameThumbnails:
+{
+iSession.RenameThumbnails( iParamsPckg, iStatus );
+break;
+}
 default:
 {
 break;
 }
 }
 iRequestCompleted = ETrue;
 }
 iTimer->Cancel();
-if (iRequestType == EReqDeleteThumbnails || iCanceled)
+if (iRequestType == EReqDeleteThumbnails || iCanceled ||
-{
+iRequestType == EReqRenameThumbnails)
-// no action for delete or canceled request
+{
+TN_DEBUG1( "CThumbnailRequestActive::RunL() - rename/delete/canceled" );
+iFile.Close();
+iMyFileHandle.Close();
+// no action for delete/rename 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;
 iError = KErrNone;
 }
 ReleaseServerBitmap();
+iFile.Close();
+iMyFileHandle.Close();
 iRequestCompleted = ETrue;
 iRequestQueue->RequestComplete(this);
 iRequestActive = EFalse;
 }
 iPath = aPath;
 }
 // ---------------------------------------------------------------------------
+// CThumbnailRequestActive::RenameThumbnails()
+// Rename thumbnails.
+// ---------------------------------------------------------------------------
+//
+void CThumbnailRequestActive::RenameThumbnails( const TDesC& aCurrentPath,
+const TDesC& aNewPath, const TInt aPriority )
+{
+iRequestType = EReqRenameThumbnails;
+iParams.iRequestId = iRequestId;
+iParams.iPriority = aPriority;
+iParams.iFileName = aCurrentPath;
+iParams.iTargetUri = aNewPath;
+}
+// ---------------------------------------------------------------------------
 // Request 2nd phase thumbnail
 // ---------------------------------------------------------------------------
 //
 void CThumbnailRequestActive::Get2ndPhaseThumbnailL()
 {
 {
 TN_DEBUG1( "CThumbnailRequestActive::TimerCallBack() - request timeout");
 CThumbnailRequestActive* self = static_cast<CThumbnailRequestActive*>( aAny );
+self->iTimer->Cancel();
+if (self->IsActive())
+{
+// hangs without this
+TRequestStatus* statusPtr = &self->iStatus;
+User::RequestComplete( statusPtr, KErrTimedOut );
+}
 self->Cancel();
-self->iTimer->Cancel();
 if (self->iStartError != KErrNone)
 {
 self->iError = self->iStartError;
 }
 self->iError = KErrTimedOut;
 }
 self->HandleError();
+TN_DEBUG1( "CThumbnailRequestActive::TimerCallBack() - end");
 return KErrNone;
 }
 // End of file

changeset 17	ffa62e555b02
parent 15	7197e789b953
child 19	b790c5b3d11f