equal
deleted
inserted
replaced
498 TClientType(TCFClientType::EData, TCFClientType::ELeaving)); |
498 TClientType(TCFClientType::EData, TCFClientType::ELeaving)); |
499 iContext.iNodeActivity->PostRequestTo(*dc, TCFDataClient::TStop(iContext.iNodeActivity->Error()).CRef()); |
499 iContext.iNodeActivity->PostRequestTo(*dc, TCFDataClient::TStop(iContext.iNodeActivity->Error()).CRef()); |
500 } |
500 } |
501 |
501 |
502 // ----------------------------------------------------------------------------- |
502 // ----------------------------------------------------------------------------- |
503 // CS60MobilityActivity::TAwaitingPreferredCarrierOrCancelOrRejected::Accept |
503 // CS60MobilityActivity::TAwaitingPreferredCarrierOrCancelOrRejectedOrErrorNotification::Accept |
504 // ----------------------------------------------------------------------------- |
504 // ----------------------------------------------------------------------------- |
505 // |
505 // |
506 DEFINE_SMELEMENT( CS60MobilityActivity::TAwaitingPreferredCarrierOrCancelOrRejected, |
506 DEFINE_SMELEMENT( CS60MobilityActivity::TAwaitingPreferredCarrierOrCancelOrRejectedOrErrorNotification, |
507 NetStateMachine::MState, TContext ) |
507 NetStateMachine::MState, TContext ) |
508 TBool CS60MobilityActivity::TAwaitingPreferredCarrierOrCancelOrRejected::Accept() |
508 TBool CS60MobilityActivity::TAwaitingPreferredCarrierOrCancelOrRejectedOrErrorNotification::Accept() |
509 { |
509 { |
510 TBool result( EFalse ); |
510 TBool result( EFalse ); |
511 |
511 |
512 if ( iContext.iMessage.IsMessage<TCFS60MCPRMessage::TMPMPreferredCarrierAvailableMsg>() ) |
512 if ( iContext.iMessage.IsMessage<TCFS60MCPRMessage::TMPMPreferredCarrierAvailableMsg>() ) |
513 { |
513 { |
516 TCFS60MCPRMessage::TMPMPreferredCarrierAvailableMsg* msg = |
516 TCFS60MCPRMessage::TMPMPreferredCarrierAvailableMsg* msg = |
517 message_cast<TCFS60MCPRMessage::TMPMPreferredCarrierAvailableMsg>( &iContext.iMessage ); |
517 message_cast<TCFS60MCPRMessage::TMPMPreferredCarrierAvailableMsg>( &iContext.iMessage ); |
518 |
518 |
519 TMpmNotificationPrefIAPAvailable* notif = (TMpmNotificationPrefIAPAvailable*)msg->iPtr; |
519 TMpmNotificationPrefIAPAvailable* notif = (TMpmNotificationPrefIAPAvailable*)msg->iPtr; |
520 |
520 |
521 S60MCPRLOGSTRING4("S60MCPR<%x>::TAwaitingPreferredCarrierOrCancelOrRejected::Accept() TMPMPreferredCarrierAvailableMsg %d -> %d upgrade=%d", |
521 S60MCPRLOGSTRING4("S60MCPR<%x>::TAwaitingPreferredCarrierOrCancelOrRejectedOrErrorNotification::Accept() TMPMPreferredCarrierAvailableMsg %d -> %d upgrade=%d", |
522 (TInt*)&iContext.Node(), notif->iOldIapId, notif->iNewIapId, notif->iIsUpgrade) |
522 (TInt*)&iContext.Node(), notif->iOldIapId, notif->iNewIapId, notif->iIsUpgrade) |
523 // notif must be there. |
523 // notif must be there. |
524 ASSERT(notif); |
524 ASSERT(notif); |
525 |
525 |
526 // Message received ok, clear the pending preferred IAP. |
526 // Message received ok, clear the pending preferred IAP. |
536 |
536 |
537 result = ETrue; |
537 result = ETrue; |
538 } |
538 } |
539 else if ( iContext.iMessage.IsMessage<TEBase::TCancel>() ) |
539 else if ( iContext.iMessage.IsMessage<TEBase::TCancel>() ) |
540 { |
540 { |
541 S60MCPRLOGSTRING1("S60MCPR<%x>::TAwaitingPreferredCarrierOrCancelOrRejected::Accept() TCancel", |
541 S60MCPRLOGSTRING1("S60MCPR<%x>::TAwaitingPreferredCarrierOrCancelOrRejectedOrErrorNotification::Accept() TCancel", |
542 (TInt*)&iContext.Node()) |
542 (TInt*)&iContext.Node()) |
543 |
543 |
544 result = ETrue; |
544 result = ETrue; |
545 } |
545 } |
546 else if ( iContext.iMessage.IsMessage<TCFMobilityProvider::TMigrationRejected>() ) |
546 else if ( iContext.iMessage.IsMessage<TCFMobilityProvider::TMigrationRejected>() ) |
547 { |
547 { |
548 S60MCPRLOGSTRING1("S60MCPR<%x>::TAwaitingPreferredCarrierOrCancelOrRejected::Accept() TMigrationRejected", |
548 S60MCPRLOGSTRING1("S60MCPR<%x>::TAwaitingPreferredCarrierOrCancelOrRejectedOrErrorNotification::Accept() TMigrationRejected", |
549 (TInt*)&iContext.Node()) |
549 (TInt*)&iContext.Node()) |
550 |
550 |
|
551 result = ETrue; |
|
552 } |
|
553 else if ( iContext.iMessage.IsMessage<TCFS60MCPRMessage::TMPMErrorNotificationMsg>() ) |
|
554 { |
|
555 CS60MobilityActivity& activity = static_cast<CS60MobilityActivity&>(*iContext.iNodeActivity); |
|
556 TCFS60MCPRMessage::TMPMErrorNotificationMsg* msg = |
|
557 message_cast<TCFS60MCPRMessage::TMPMErrorNotificationMsg>( &iContext.iMessage ); |
|
558 S60MCPRLOGSTRING2("S60MCPR<%x>::TAwaitingPreferredCarrierOrCancelOrRejectedOrErrorNotification::Accept() TMPMErrorNotificationMsg %d",(TInt*)&iContext.Node(),msg->iValue) |
|
559 ASSERT( msg->iValue != KErrNone ); |
|
560 activity.SetError( msg->iValue ); |
551 result = ETrue; |
561 result = ETrue; |
552 } |
562 } |
553 |
563 |
554 return result; |
564 return result; |
555 } |
565 } |