MCL/sf/mw/classicui: comparison uifw/AvKon/src/aknmessagequerydialog.cpp

equal deleted inserted replaced

-:aecbbf00d063
+:d48ab3b357f1
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <touchfeedback.h>
 #include <AknTasHook.h> // for testability hooks
 #include "AknHeadingPaneTouchObserver.h"
+#include "akntrace.h"
 // CONSTANTS
 const TInt KMaxLinks = 64;
 const TInt KLinkStartTagLength = 22;
 const TInt KLinkEndTagLength = 23;
 const TInt KBoldStartTagLength = 22;
 const TInt KBoldEndTagLength = 23;
+NONSHARABLE_CLASS(CAknAsynCallbackRunner) : public CActive
+{
+public:
+CAknAsynCallbackRunner( CAknMessageQueryDialogExtension* aMsgQueryExtension );
+~CAknAsynCallbackRunner();
+public:
+// new functions
+void AsyncCallbackRunL( TInt aCurLink );
+// from CActive
+void DoCancel();
+void RunL();
+private:
+CAknMessageQueryDialogExtension* iMsgQueryExtension;
+TInt iCurLink;
+};
 class CAknMessageQueryDialogExtension : public CBase, public CAknExtendedInputCapabilities::MAknEventObserver,
 public MAknHeadingPaneTouchObserver
 {
 public:
 CAknMessageQueryDialogExtension( CAknMessageQueryDialog* aParent  ) : iParent(aParent),
 iControlRegisted( EFalse ) {}
 ~CAknMessageQueryDialogExtension()
 {
+delete iAsyncCallbackRunner;
 TInt count = iFormatTextArray.Count();
 for ( TInt i = 0; i < count; i++ )
 {
 delete iFormatTextArray[i];
 }
 iCallBackArray.Close();
 iFormatTextLocationArray.Close();
 iFormatTextArray.Close();
 iFormatTypeArray.Close();
-if ( iDestroyedPtr )
-{
-// Mark the object as destroyed.
-*iDestroyedPtr = ETrue;
-iDestroyedPtr = NULL;
-}
 }
 /** From CAknExtendedInputCapabilities::MAknEventObserver
 */
 void HandleInputCapabilitiesEventL( TInt aEvent, TAny* aParams )
 if( aPointerEvent.iType == TPointerEvent::EButton1Down && iCtrl )
 {
 iCtrl->DehighlightLink();
 }
 }
+void ExecuteLinkCallbackL( TInt aCurLink )
+{
+if ( !iAsyncCallbackRunner )
+{
+iAsyncCallbackRunner = new( ELeave ) CAknAsynCallbackRunner( this );
+}
+iAsyncCallbackRunner->AsyncCallbackRunL( aCurLink );
+}
 public:
 TInt iAnimationId;
 TInt iLinkCount; // values between 0 and KMaxLinks-1
 TBool iMarkedLinks;
 TInt iButtonGroupPreviouslyChanged;
 CAknMessageQueryDialog* iParent;
 TBool iControlRegisted;
 CAknMessageQueryControl* iCtrl;
-/**
-* @c iDestroyedPtr is used for the object destruction check.
-* If it has non-null value, the destruction check is turned on, and
-* the value points to a local boolean variable that keeps the destroyed state.
-*/
-TBool* iDestroyedPtr;
 TBool iIsInEditor;
+CAknAsynCallbackRunner* iAsyncCallbackRunner;
 };
+CAknAsynCallbackRunner::CAknAsynCallbackRunner(
+CAknMessageQueryDialogExtension* aMsgQueryExtension ) :
+CActive( EPriorityStandard ), iMsgQueryExtension( aMsgQueryExtension )
+{
+CActiveScheduler::Add( this );
+}
+CAknAsynCallbackRunner::~CAknAsynCallbackRunner()
+{
+Cancel();
+}
+void CAknAsynCallbackRunner::AsyncCallbackRunL( TInt aCurLink )
+{
+iCurLink = aCurLink;
+if ( !IsActive() )
+{
+iStatus = KRequestPending;
+TRequestStatus* status = &iStatus;
+User::RequestComplete( status, KErrNone );
+SetActive();
+}
+}
+void CAknAsynCallbackRunner::DoCancel()
+{
+}
+void CAknAsynCallbackRunner::RunL()
+{
+if ( iMsgQueryExtension && iCurLink >= 0 &&
+iCurLink < iMsgQueryExtension->iCallBackArray.Count() )
+{
+iMsgQueryExtension->iCallBackArray[iCurLink].CallBack();
+}
+}
 EXPORT_C CAknMessageQueryDialog* CAknMessageQueryDialog::NewL( TDesC& aMessage, const TTone& aTone )
 {
+	_AKNTRACE_FUNC_ENTER;
 CAknMessageQueryDialog* self = new ( ELeave ) CAknMessageQueryDialog( aTone );
 CleanupStack::PushL( self );
 self->SetMessageTextL( aMessage );
 CleanupStack::Pop(); //self
 AKNTASHOOK_ADDL( self, "CAknMessageQueryDialog" );
+_AKNTRACE_FUNC_EXIT;
 return self;
 }
 //@deprecated
 EXPORT_C CAknMessageQueryDialog::CAknMessageQueryDialog() : CAknQueryDialog( ENoTone )
 #endif
 }
 EXPORT_C CAknMessageQueryDialog::CAknMessageQueryDialog( const TTone aTone ) : CAknQueryDialog( aTone )
 {
+	_AKNTRACE_FUNC_ENTER;
 #ifndef RD_NO_DIALOG_BORDERS
 iBorder = AknBorderId::EAknBorderNotePopup;
 #else
 iBorder = TGulBorder::ENone;
 #endif
+_AKNTRACE_FUNC_EXIT;
 }
 //@deprecated
 EXPORT_C CAknMessageQueryDialog::CAknMessageQueryDialog( TDesC* aMessage, TDesC* aHeader )
 : CAknQueryDialog( ENoTone ), iMessage( aMessage ), iHeader( aHeader )
 #endif
 }
 EXPORT_C CAknMessageQueryDialog::~CAknMessageQueryDialog()
 {
+	_AKNTRACE( "[%s][%s] Enter", "CAknMessageQueryDialog", "~CAknMessageQueryDialog" );
 AKNTASHOOK_REMOVE();
 delete iMessage;
 delete iHeader;
 delete iHeaderImage;
 RegisterPointerEventObserver( EFalse );
 delete iMsgQueryExtension;
+_AKNTRACE( "[%s][%s] Exit", "CAknMessageQueryDialog", "~CAknMessageQueryDialog" );
 }
 EXPORT_C void CAknMessageQueryDialog::SetMessageTextL( const TDesC& aMessage )
 {
 delete iMessage;
 iMsgQueryExtension->iFormatTextArray[lastIndex] = aLinkText.AllocL();
 }
 else
 {
 // SetLinkTextL creates new callback in the callback array for the new link
-iMsgQueryExtension->iFormatTextArray.Append( aLinkText.AllocL() );
+			HBufC* linkText = aLinkText.AllocL();
-iMsgQueryExtension->iFormatTypeArray.Append( EMsgQueryLink );
+			CleanupStack::PushL( linkText );
+			iMsgQueryExtension->iFormatTextArray.AppendL( linkText );
+			CleanupStack::Pop( linkText );
+iMsgQueryExtension->iFormatTypeArray.AppendL( EMsgQueryLink );
 // If the other method SetLink has been already called
 // the new link is finished by adding the link count
 if ( iMsgQueryExtension->iCallBackArray.Count() > iMsgQueryExtension->iLinkCount )
 {
 if ( iMsgQueryExtension->iMarkedLinks )
 {
 if ( iMsgQueryExtension->iCallBackArray.Count() < iMsgQueryExtension->iLinkCount )
 {
 // SetLink creates new callback in the callback array for the new link
-iMsgQueryExtension->iCallBackArray.Append( aCallBack );
+			if ( KErrNone != iMsgQueryExtension->iCallBackArray.Append( aCallBack ) )
+				{
+				return;
+				}
 }
 }
 else if ( iMsgQueryExtension->iLinkCount < KMaxLinks )
 {
 if ( iMsgQueryExtension->iCallBackArray.Count() > iMsgQueryExtension->iLinkCount )
 iMsgQueryExtension->iCallBackArray[iMsgQueryExtension->iCallBackArray.Count()-1] = aCallBack;
 }
 else
 {
 // SetLink creates new callback in the callback array for the new link
-iMsgQueryExtension->iCallBackArray.Append( aCallBack );
+if ( KErrNone != iMsgQueryExtension->iCallBackArray.Append( aCallBack ) )
+	{
+	return;
+	}
 // If the other method SetLinkText has been already called
 // the new link is finished by adding the link count
 if ( LinksInArray() > iMsgQueryExtension->iLinkCount )
 iHeader = aHeader;
 }
 EXPORT_C void CAknMessageQueryDialog::PreLayoutDynInitL()
 {
+_AKNTRACE_FUNC_ENTER;
 if ( !iMsgQueryExtension )
 {
 CreateExtensionL();
 }
 if (headingPane)
 {
 headingPane->SetLayout(CAknPopupHeadingPane::EMessageQueryHeadingPane); // Use message query heading layout.
 headingPane->SetTouchObserver( iMsgQueryExtension );
 }
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknMessageQueryDialog::SetSizeAndPosition( const TSize& aSize )
 {
 return EFalse;
 }
 }
 delete messageBuf;
 }
-iMsgQueryExtension->iFormatTextLocationArray.Append( linkTextLocation );
+iMsgQueryExtension->iFormatTextLocationArray.AppendL( linkTextLocation );
 return ETrue;
 }
 void CAknMessageQueryDialog::CreateExtensionL()
 {
 * the link execution.
 */
 TBool CAknMessageQueryDialog::ExecuteLinkL()
 {
-CAknMessageQueryControl* control = STATIC_CAST( CAknMessageQueryControl*, Control( EAknMessageQueryContentId ) );
+	_AKNTRACE_FUNC_ENTER;
+	CAknMessageQueryControl* control = STATIC_CAST( CAknMessageQueryControl*, Control( EAknMessageQueryContentId ) );
 if( !control )
 {
+		_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 if( !control->LinkHighLighted() )
 {
+		_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 TInt curLink = control->CurrentLink();
-/**
+TRAP_IGNORE( iMsgQueryExtension->ExecuteLinkCallbackL( curLink ) );
-* The local @c destroyed variable keeps track of the object destroyed state.
+control->DehighlightLink();
-*/
+_AKNTRACE_FUNC_EXIT;
-TBool destroyed = EFalse;
-iMsgQueryExtension->iDestroyedPtr = &destroyed;
-TRAPD( err, iMsgQueryExtension->iCallBackArray[curLink].CallBack() );
-if ( !destroyed )
-{
-iMsgQueryExtension->iDestroyedPtr = NULL;
-}
-User::LeaveIfError( err );
-if ( !destroyed )
-{
-control->DehighlightLink();
-}
 return ETrue;
 }
 //  End of File

branch	RCL_3
changeset 20	d48ab3b357f1
parent 19	aecbbf00d063