harvester/client/src/harvesterrequestactive.cpp
branchRCL_3
changeset 47 b73252188534
parent 14 646a02f170b9
equal deleted inserted replaced
46:63c982fb92f2 47:b73252188534
    30 CHarvesterRequestActive::~CHarvesterRequestActive()
    30 CHarvesterRequestActive::~CHarvesterRequestActive()
    31     {
    31     {
    32     if( IsActive() )
    32     if( IsActive() )
    33         {
    33         {
    34         Cancel();
    34         Cancel();
    35         if( iObserver )
       
    36             {
       
    37             iObserver->HarvestingComplete( iUri, KErrCancel );
       
    38             }    
       
    39         iRequestCompleted = ETrue;
       
    40         }
    35         }
    41     
    36     
       
    37     iRequestCompleted = ETrue;
    42     delete iAlbumIds;
    38     delete iAlbumIds;
       
    39     iAlbumIds = NULL;
    43     }
    40     }
    44 
    41 
    45 // ---------------------------------------------------------------------------
    42 // ---------------------------------------------------------------------------
    46 // CHarvesterRequestActive::NewL
    43 // CHarvesterRequestActive::NewL
    47 // Two-phased constructor.
    44 // Two-phased constructor.
    77 // CHarvesterRequestActive::RunL()
    74 // CHarvesterRequestActive::RunL()
    78 // ---------------------------------------------------------------------------
    75 // ---------------------------------------------------------------------------
    79 //
    76 //
    80 void CHarvesterRequestActive::RunL()
    77 void CHarvesterRequestActive::RunL()
    81     {
    78     {
       
    79     if( iStatus.Int() == KErrCancel )
       
    80         {
       
    81         return;
       
    82         }           
       
    83     
    82     if( iStatus.Int() && iObserver )
    84     if( iStatus.Int() && iObserver )
    83         {
    85         {
    84         iObserver->HarvestingComplete( iUri, iStatus.Int() );
    86         iObserver->HarvestingComplete( iUri, iStatus.Int() );
    85         }       
    87         }       
       
    88     
    86     iRequestCompleted = ETrue;
    89     iRequestCompleted = ETrue;
    87     if( iRequestQueue )
    90     if( iRequestQueue )
    88         {
    91         {
    89         iRequestQueue->RequestComplete();
    92         iRequestQueue->RequestComplete();
    90         }
    93         }
   102         }
   105         }
   103     
   106     
   104     if( iObserver )
   107     if( iObserver )
   105         {
   108         {
   106         iObserver->HarvestingComplete( iUri, aError );
   109         iObserver->HarvestingComplete( iUri, aError );
   107         }    
   110         }
       
   111     
   108     iRequestCompleted = ETrue;
   112     iRequestCompleted = ETrue;
   109     return KErrNone;
   113     return KErrNone;
   110     }
   114     }
   111 
   115 
   112 // ---------------------------------------------------------------------------
   116 // ---------------------------------------------------------------------------
   114 // ---------------------------------------------------------------------------
   118 // ---------------------------------------------------------------------------
   115 //
   119 //
   116 void CHarvesterRequestActive::DoCancel()
   120 void CHarvesterRequestActive::DoCancel()
   117     {
   121     {
   118     iCancelled = ETrue;
   122     iCancelled = ETrue;
       
   123 	iObserver = NULL;
   119     }
   124     }
   120 
   125 
   121 // ---------------------------------------------------------------------------
   126 // ---------------------------------------------------------------------------
   122 // CHarvesterRequestActive::Start()
   127 // CHarvesterRequestActive::Start()
   123 // ---------------------------------------------------------------------------
   128 // ---------------------------------------------------------------------------