FCL/sf/mw/drm: comparison commondrm/drmutility/src/DrmUiHandlingImpl.cpp

equal deleted inserted replaced

-:a117e284a2c6
+:b09186059647
 //
 DRM::CDrmUiHandlingImpl::~CDrmUiHandlingImpl()
 {
 DRM::CDrmUiHandlingData* data( PopFront() );
+// reset the current observer
+// it may already be deleted so don't do any calls to it.
+iObserver = NULL;
 // Empty the queue:
 while ( data )
 {
 // Complete the outstanding requestest with cancel
 data->iObserver->OperationCompleted( data->iOperationId, KErrCancel );
 default:
 break;
 }
-// Complete the client request
+// if the observer exists and it has not been deleted, call complete
-iObserver->OperationCompleted( iOperationId, KErrNone );
+// for the operation and get ready for another round
+// this should prevent crashes in case the class is deleted before
+// and operation finihes.
+if( iObserver && reinterpret_cast<TInt>(iObserver) != 0xDEDEDEDE )
+{
+// Complete the client request
+iObserver->OperationCompleted( iOperationId, KErrNone );
+// Get ready for another round:
+SetActive();
+// complete internal request:
+User::RequestComplete( status, KErrNone );
+}
 // destroy the object:
 CleanupStack::PopAndDestroy( data );
-// Get ready for another round:
-SetActive();
-// complete internal request:
-User::RequestComplete( status, KErrNone );
 }
 // -----------------------------------------------------------------------------
 // CDrmUiHandlingImpl::RunError()
 // -----------------------------------------------------------------------------
 // Show that only reason for error was rejected metering.
 TBool onlyMeteringRejection( reason == DRM::EURejectionMetering );
 if ( onlyMeteringRejection )
 {
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfUnableToOpen );
 CleanupStack::PopAndDestroy( contentId );
 return;
 }
 ptr.Set( domainId->Des() );
 error = stringAttributeSet.GetValue( EDomainId, ptr );
 if ( !error )
 {
 ptr.Set( riId->Des() );
-stringAttributeSet.GetValue( EDomainRightsIssuerId, ptr );
+error = stringAttributeSet.GetValue( EDomainRightsIssuerId, ptr );
 if ( !error )
 {
 riId8 = HBufC8::NewLC( riId->Length() );
 riId8->Des().Copy( riId->Des() );
 domainId8 = HBufC8::NewLC( domainId->Length() );
 case DRM::EUHCheckRightsActionDefault:
 {
 if ( RejectReason( aReason ) == DRM::EURejectionMetering )
 {
 // Show that only reason for error was rejected metering.
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfUnableToOpen );
 }
 else
 {
 if ( !GetSilentAndCallL( aObserver, aOperationId, aIntent,
 ret = iDrmUtilityUi->DisplayQueryL( EQueryGetNewLicence, KNoValue );
 }
 else
 {
 // no rights issuer
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfLicenceNotReceived );
 }
 }
 else if ( !eta || err || eta == -1 )
 {
 {
 // get filename
 User::LeaveIfError( aContent.GetStringAttribute(
 EFileName, fileName ) );
-// Qt dialog not implemented yet
 ret = iDrmUtilityUi->DisplayQueryL( EQueryFileWithNoRightsObj, fileName );
 }
 }
 else // no rights issuer
 {
 if ( aReason & EConstraintIndividual )
 {
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfFileLockedForSim );
 }
 else
 {
 iDrmUtilityUi->DisplayNoteL( EConfLicenceExpired );
 {
 ret = iDrmUtilityUi->DisplayQueryL( EQueryGetNewLicence, KNoValue );
 }
 else
 {
 // no rights issuer
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfLicenceNotReceived );
 }
 }
 }
 }
 ptr.Set( domainId->Des() );
 error = stringAttributeSet.GetValue( EDomainId, ptr );
 if ( !error )
 {
 ptr.Set( riId->Des() );
-stringAttributeSet.GetValue( EDomainRightsIssuerId, ptr );
+error = stringAttributeSet.GetValue( EDomainRightsIssuerId, ptr );
 if ( !error )
 {
 riId8 = HBufC8::NewLC( riId->Length() );
 riId8->Des().Copy( riId->Des() );
 domainId8 = HBufC8::NewLC( domainId->Length() );
 if ( !SilentRightsAllowedL() )
 {
 buttonCode = ECancelled;
 if ( aShowNotes )
 {
-// Qt dialog not implemented yet
 buttonCode = iDrmUtilityUi->DisplayQueryL( EQueryConnectToActivate, KNoValue );
 }
 }
 else if ( !(HasDefConn()) )
 {
 buttonCode = ECancelled;
 if ( aShowNotes )
 {
-// Qt dialog not implemented yet
 buttonCode = iDrmUtilityUi->DisplayQueryL( EQueryConnectToActivate, KNoValue );
 }
 }
 if ( buttonCode == EOk )
 if ( !APs )
 {
 // No AP defined
 if ( aShowNotes )
 {
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfNoAccessPoint );
 }
 r = KErrCANoRights;
 }
 else
 if ( r == KErrCouldNotConnect )
 {
 // Connection failed with selected AP
 if ( aShowNotes )
 {
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfConnectionFailed );
 }
 r = KErrCANoRights;
 }
 else
 // error url is got only if temporary roap error
 if ( errorUrl )
 {
 // ask user whether error url should be opened
-// Qt dialog not implemented yet
 buttonCode = iDrmUtilityUi->DisplayQueryL( EQueryOpenErrorUrl, KNoValue );
 if ( buttonCode == EOk )
 {
 // Launch browser
 LaunchBrowserL( errorUrl );
 }
 }
 else
 {
-// Qt dialog not implemented yet
 iDrmUtilityUi->DisplayNoteL( EConfUnableToUnlock );
 }
 CleanupStack::PopAndDestroy( errorUrl );
 }
 }

changeset 84	b09186059647
parent 49	69d8e75812b7