equal
deleted
inserted
replaced
79 iIapSelection( NULL ), |
79 iIapSelection( NULL ), |
80 iMigrateState( EMigrateNone ), |
80 iMigrateState( EMigrateNone ), |
81 iLastNotifiedIap( 0 ), |
81 iLastNotifiedIap( 0 ), |
82 iMigrateIap( 0 ), |
82 iMigrateIap( 0 ), |
83 iUserConnection( 0 ), |
83 iUserConnection( 0 ), |
84 iVpnUserConnectionUsed( EFalse ) |
84 iVpnUserConnectionUsed( EFalse ), |
|
85 iErrorDiscreetPopupShown( EFalse ) |
85 { |
86 { |
86 } |
87 } |
87 |
88 |
88 |
89 |
89 // ----------------------------------------------------------------------------- |
90 // ----------------------------------------------------------------------------- |
1427 { |
1428 { |
1428 // Note: Below function shows the discreet popup only if the error code |
1429 // Note: Below function shows the discreet popup only if the error code |
1429 // belongs to the set of errors that are shown to the user. |
1430 // belongs to the set of errors that are shown to the user. |
1430 // Otherwise the popup is not shown. |
1431 // Otherwise the popup is not shown. |
1431 iMyServer.ConnUiUtils()->ConnectionErrorDiscreetPopup( error ); |
1432 iMyServer.ConnUiUtils()->ConnectionErrorDiscreetPopup( error ); |
|
1433 |
|
1434 // Error discreet popup has been shown. This is needed so that we |
|
1435 // dont show it again for SNAP. |
|
1436 iErrorDiscreetPopupShown = ETrue; |
1432 } |
1437 } |
1433 |
1438 |
1434 TConnMonIapInfo availableIAPs; |
1439 TConnMonIapInfo availableIAPs; |
1435 availableIAPs = GetAvailableIAPs(); |
1440 availableIAPs = GetAvailableIAPs(); |
1436 |
1441 |
3289 MPMLOGSTRING( "CMPMServerSession::ChooseIapComplete Message completed" ) |
3294 MPMLOGSTRING( "CMPMServerSession::ChooseIapComplete Message completed" ) |
3290 iChooseIapMessage.Complete( aError ); |
3295 iChooseIapMessage.Complete( aError ); |
3291 } |
3296 } |
3292 |
3297 |
3293 // Show error popup if it's allowed per client request |
3298 // Show error popup if it's allowed per client request |
|
3299 // Error popup shown to SNAP only if error discreet has not been shown for IAP. |
3294 if ( ChooseBestIapCalled() && (!( iIapSelection->MpmConnPref().NoteBehaviour() & |
3300 if ( ChooseBestIapCalled() && (!( iIapSelection->MpmConnPref().NoteBehaviour() & |
3295 TExtendedConnPref::ENoteBehaviourConnDisableNotes )) |
3301 TExtendedConnPref::ENoteBehaviourConnDisableNotes )) |
3296 && ( aError != KErrNone ) |
3302 && ( aError != KErrNone ) |
3297 && ( iIapSelection->MpmConnPref().SnapId() == 0 ) ) |
3303 && ( iErrorDiscreetPopupShown == EFalse ) ) |
3298 { |
3304 { |
3299 // Note: Below function shows the discreet popup only if the error code |
3305 // Note: Below function shows the discreet popup only if the error code |
3300 // belongs to the set of errors that are shown to the user. |
3306 // belongs to the set of errors that are shown to the user. |
3301 // Otherwise the popup is not shown. |
3307 // Otherwise the popup is not shown. |
3302 iMyServer.ConnUiUtils()->ConnectionErrorDiscreetPopup( aError ); |
3308 iMyServer.ConnUiUtils()->ConnectionErrorDiscreetPopup( aError ); |
3312 |
3318 |
3313 iMyServer.ConnUiUtils()->ConnectingViaDiscreetPopup( aPolicyPref->IapId(), |
3319 iMyServer.ConnUiUtils()->ConnectingViaDiscreetPopup( aPolicyPref->IapId(), |
3314 connectionAlreadyActive ); |
3320 connectionAlreadyActive ); |
3315 } |
3321 } |
3316 } |
3322 } |
|
3323 |
|
3324 // Enable showing error discreet popup for SNAP again |
|
3325 iErrorDiscreetPopupShown = EFalse; |
3317 } |
3326 } |
3318 |
3327 |
3319 |
3328 |
3320 // ----------------------------------------------------------------------------- |
3329 // ----------------------------------------------------------------------------- |
3321 // CMPMServerSession::ProcessErrorComplete |
3330 // CMPMServerSession::ProcessErrorComplete |