equal
deleted
inserted
replaced
549 CMmDataPackage* aDataPackage ) |
549 CMmDataPackage* aDataPackage ) |
550 { |
550 { |
551 TFLOGSTRING("TSY: CMmUssdTsy::CompleteReceiveMessage.\n" ); |
551 TFLOGSTRING("TSY: CMmUssdTsy::CompleteReceiveMessage.\n" ); |
552 TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( |
552 TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( |
553 EMultimodeUssdReceiveMessage ); |
553 EMultimodeUssdReceiveMessage ); |
554 |
554 |
|
555 |
555 if ( ( EMultimodeUssdReqHandleUnknown != reqHandle ) ) |
556 if ( ( EMultimodeUssdReqHandleUnknown != reqHandle ) ) |
556 { |
557 { |
557 // reset req handle. Returns the deleted req handle |
558 // reset req handle. Returns the deleted req handle |
558 reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( |
559 reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( |
559 EMultimodeUssdReceiveMessage ); |
560 EMultimodeUssdReceiveMessage ); |
571 } |
572 } |
572 else |
573 else |
573 { |
574 { |
574 aError = KErrArgument; |
575 aError = KErrArgument; |
575 } |
576 } |
|
577 |
576 } |
578 } |
|
579 |
577 ReqCompleted( reqHandle, aError ); |
580 ReqCompleted( reqHandle, aError ); |
578 } |
581 } |
579 } |
582 } |
580 |
583 |
581 // --------------------------------------------------------------------------- |
584 // --------------------------------------------------------------------------- |
614 EMobileUssdMessagingSendMessageNoFdnCheck, &package ); |
617 EMobileUssdMessagingSendMessageNoFdnCheck, &package ); |
615 } |
618 } |
616 if ( iUssdNoFdnCheckFlag == EUssdNoFdnCheckNotUsed ) |
619 if ( iUssdNoFdnCheckFlag == EUssdNoFdnCheckNotUsed ) |
617 { |
620 { |
618 // Send request to the Domestic OS layer. |
621 // Send request to the Domestic OS layer. |
619 if(EFalse == iSendToDefaultHandler) |
622 ret = iMmPhone->MessageManager()->HandleRequestL( |
620 { |
623 EMobileUssdMessagingSendMessage, &package ); |
621 ret = iMmPhone->MessageManager()->HandleRequestL( |
|
622 EMobileUssdMessagingSendMessage, &package ); |
|
623 } |
|
624 else //default handler |
|
625 { |
|
626 ret = iMmPhone->MessageManager()->HandleRequestL( |
|
627 EMobileUssdMessagingSendMessageDefaultHandler, &package ); |
|
628 } |
|
629 } |
624 } |
630 iSsTransactionOngoing = ETrue; |
625 iSsTransactionOngoing = ETrue; |
631 } |
626 } |
632 |
627 |
633 if ( KErrNone != ret ) |
628 if ( KErrNone != ret ) |
768 if ( !IsSessionInProgress() && IsSessionReserved() ) |
763 if ( !IsSessionInProgress() && IsSessionReserved() ) |
769 { |
764 { |
770 if ( KErrNone == aError ) |
765 if ( KErrNone == aError ) |
771 { |
766 { |
772 if(EFalse == iSendToDefaultHandler) |
767 if(EFalse == iSendToDefaultHandler) |
773 { |
768 { |
774 SetSessionOwnerByTsyHandle( reqHandle ); |
769 //This is the non-default handler case. Session owner remains the same. |
|
770 //This session owner will get the newly received message. |
|
771 SetSessionOwnerByTsyHandleAndIpc( reqHandle, NULL ); |
775 } |
772 } |
776 else // default handler |
773 else // default handler |
777 { |
774 { |
778 //this function call will transfer received message to the |
775 //this function call will transfer received message to the |
779 //default handler which already has EMobileUssdMessagingReceiveMessage request. |
776 //default handler which already has EMobileUssdMessagingReceiveMessage request. |