equal
deleted
inserted
replaced
88 void CMPMServerSession::ConstructL() |
88 void CMPMServerSession::ConstructL() |
89 { |
89 { |
90 MPMLOGSTRING( "CMPMServerSession::ConstructL" ) |
90 MPMLOGSTRING( "CMPMServerSession::ConstructL" ) |
91 if ( !iMyServer.Events() ) |
91 if ( !iMyServer.Events() ) |
92 { |
92 { |
93 iMyServer.SetEvents(CMPMConnMonEvents::NewL( |
93 iMyServer.SetEvents( CMPMConnMonEvents::NewL( |
94 *const_cast<CMPMServer*>( &iMyServer ), *this )); |
94 *const_cast<CMPMServer*>( &iMyServer ) ) ); |
95 } |
95 } |
96 |
96 |
97 // Append session pointer to server |
97 // Append session pointer to server |
98 // |
98 // |
99 iMyServer.AppendSessionL( this ); |
99 iMyServer.AppendSessionL( this ); |
505 "CMPMServerSession::HandleServerCancelRequest - Complete with KErrNone" ) |
505 "CMPMServerSession::HandleServerCancelRequest - Complete with KErrNone" ) |
506 aMessage.Complete( KErrNone ); |
506 aMessage.Complete( KErrNone ); |
507 |
507 |
508 // Cancel WLAN scan request if one exists |
508 // Cancel WLAN scan request if one exists |
509 // |
509 // |
510 TRAP_IGNORE( iMyServer.Events()->CancelScanL( *this ) ) |
510 TRAP_IGNORE( iMyServer.Events()->CancelScanL( this ) ) |
511 |
511 |
512 if ( iIapSelection ) |
512 if ( iIapSelection ) |
513 { |
513 { |
514 delete iIapSelection; |
514 delete iIapSelection; |
515 iIapSelection = NULL; |
515 iIapSelection = NULL; |
527 "CMPMServerSession::HandleServerCancelRequest - Complete with KErrNone" ) |
527 "CMPMServerSession::HandleServerCancelRequest - Complete with KErrNone" ) |
528 aMessage.Complete( KErrNone ); |
528 aMessage.Complete( KErrNone ); |
529 |
529 |
530 // Cancel WLAN scan request if one exists |
530 // Cancel WLAN scan request if one exists |
531 // |
531 // |
532 TRAP_IGNORE( iMyServer.Events()->CancelScanL( *this ) ) |
532 TRAP_IGNORE( iMyServer.Events()->CancelScanL( this ) ) |
533 |
533 |
534 if ( iDisconnectDlg ) |
534 if ( iDisconnectDlg ) |
535 { |
535 { |
536 MPMLOGSTRING( "CMPMServerSession::HandleServerCancelRequest: \ |
536 MPMLOGSTRING( "CMPMServerSession::HandleServerCancelRequest: \ |
537 removing dconn dlg" ) |
537 removing dconn dlg" ) |
554 if ( !iServerSortSNAPMessage.IsNull() ) |
554 if ( !iServerSortSNAPMessage.IsNull() ) |
555 { |
555 { |
556 // TODO Change CancelScanL to non-leaving. |
556 // TODO Change CancelScanL to non-leaving. |
557 // Otherwise, nothing clever can be done here. |
557 // Otherwise, nothing clever can be done here. |
558 // And OOM may risk MPM stability. |
558 // And OOM may risk MPM stability. |
559 TRAP_IGNORE( iMyServer.Events()->CancelScanL( *this )) |
559 TRAP_IGNORE( iMyServer.Events()->CancelScanL( this ) ) |
560 iServerSortSNAPMessage.Complete( KErrCancel ); |
560 iServerSortSNAPMessage.Complete( KErrCancel ); |
561 } |
561 } |
562 break; |
562 break; |
563 } |
563 } |
564 default: |
564 default: |
3319 TInt aError, |
3319 TInt aError, |
3320 const TMpmConnPref* aPolicyPref ) |
3320 const TMpmConnPref* aPolicyPref ) |
3321 { |
3321 { |
3322 MPMLOGSTRING2( "CMPMServerSession::ChooseIapComplete aError = %d", aError ) |
3322 MPMLOGSTRING2( "CMPMServerSession::ChooseIapComplete aError = %d", aError ) |
3323 |
3323 |
3324 // Show error popup if it's allowed per client request |
3324 // Show error popup if it's allowed per client request. |
|
3325 // No error popup shown to SNAP. |
3325 if ( ChooseBestIapCalled() && (!( iIapSelection->MpmConnPref().NoteBehaviour() & |
3326 if ( ChooseBestIapCalled() && (!( iIapSelection->MpmConnPref().NoteBehaviour() & |
3326 TExtendedConnPref::ENoteBehaviourConnDisableNotes )) |
3327 TExtendedConnPref::ENoteBehaviourConnDisableNotes )) |
3327 && ( aError != KErrNone ) ) |
3328 && ( aError != KErrNone ) |
|
3329 && ( iIapSelection->MpmConnPref().SnapId() == 0 ) ) |
3328 { |
3330 { |
3329 CConnectionUiUtilities* connUiUtils = NULL; |
3331 CConnectionUiUtilities* connUiUtils = NULL; |
3330 TRAPD( error, connUiUtils = CConnectionUiUtilities::NewL() ); |
3332 TRAPD( error, connUiUtils = CConnectionUiUtilities::NewL() ); |
3331 if ( error == KErrNone && connUiUtils ) |
3333 if ( error == KErrNone && connUiUtils ) |
3332 { |
3334 { |