965 CleanupStack::PopAndDestroy( &entryArray ); |
965 CleanupStack::PopAndDestroy( &entryArray ); |
966 |
966 |
967 HBufC8* recipient = NULL; |
967 HBufC8* recipient = NULL; |
968 const CMceSession& session = iSVPSession->Session(); |
968 const CMceSession& session = iSVPSession->Session(); |
969 __ASSERT_ALWAYS( &session, User::Leave( KErrArgument ) ); |
969 __ASSERT_ALWAYS( &session, User::Leave( KErrArgument ) ); |
970 |
970 |
971 if ( iSVPSession->IsMobileOriginated() ) |
971 TBool isCLIROn = iSVPSession->IsCLIROnL(); |
972 { |
972 |
973 SVPDEBUG1( "CSVPTransferStateContext::CreateMceOutReferL(aTarget), MO case" ) |
973 if ( ( iSVPSession->IsMobileOriginated() && !isCLIROn ) |
974 const TDesC8& recip = session.Recipient(); |
974 || ( !iSVPSession->IsMobileOriginated() && isCLIROn ) ) |
|
975 { |
|
976 SVPDEBUG1( "CSVPTransferStateContext::CreateMceOutReferL(aTarget), orig" ) |
|
977 const TDesC8& orig = session.Originator(); |
|
978 __ASSERT_ALWAYS( &orig, User::Leave( KErrArgument ) ); |
|
979 recipient = HBufC8::NewLC( orig.Length() ); |
|
980 recipient->Des().Copy( orig ); |
|
981 } |
|
982 else |
|
983 { |
|
984 SVPDEBUG1( "CSVPTransferStateContext::CreateMceOutReferL(aTarget), recip" ) |
|
985 const TDesC8& recip = session.Recipient(); |
975 __ASSERT_ALWAYS( &recip, User::Leave( KErrArgument ) ); |
986 __ASSERT_ALWAYS( &recip, User::Leave( KErrArgument ) ); |
976 recipient = HBufC8::NewLC( recip.Length() ); |
987 recipient = HBufC8::NewLC( recip.Length() ); |
977 recipient->Des().Copy( recip ); |
988 recipient->Des().Copy( recip ); |
978 } |
|
979 else |
|
980 { |
|
981 SVPDEBUG1( "CSVPTransferStateContext::CreateMceOutReferL(aTarget), MT case" ) |
|
982 const TDesC8& orig = session.Originator(); |
|
983 __ASSERT_ALWAYS( &orig, User::Leave( KErrArgument ) ); |
|
984 recipient = HBufC8::NewLC( orig.Length() ); |
|
985 recipient->Des().Copy( orig ); |
|
986 } |
989 } |
987 |
990 |
988 // remove all extra parameters from recipient address |
991 // remove all extra parameters from recipient address |
989 RemoveExtraParameters( recipient ); |
992 RemoveExtraParameters( recipient ); |
990 |
993 |