FCL/sf/mw/ipconnmgmt: comparison bearermanagement/mpm/src/mpmiapselection.cpp

equal deleted inserted replaced

-:14754bf06654
+:cf1b3ddbe9a1
 //
 CMPMIapSelection::~CMPMIapSelection()
 {
 // stop confirm dialog in case one exists
 //
-MPMLOGSTRING( "CMPMIapSelection::~CMPMIapSelection" )
 StopDisplayingStartingDlg();
+delete iConfirmDlgStarting;
 delete iDialog;
 delete iWlanDialog;
 }
 // -----------------------------------------------------------------------------
 TBool   iapTypeLanOrWlan = EFalse;
 TConnectionId connId = iSession->ConnectionId();
 ChooseBestIAPL( iChooseIapPref, availableIAPList, iNextBestExists );
-CleanupStack::PopAndDestroy( &availableIAPList );
 TUint32 validateIapId = iChooseIapPref.IapId();
 // Check if any suitable IAP's were found, if not then complete selection with error code
 if ( validateIapId == 0 )
 {
 ChooseIapComplete( KErrNotFound, NULL );
+CleanupStack::PopAndDestroy( &availableIAPList );
 return;
 }
 TUint32 retNetId( 0 );
 iCommsDatAccess->ValidateIapL( connId,
 snap,
 validateIapId,
 EStarting,
 *iSession );
 ChooseIapComplete( KErrNone, &iChooseIapPref );
-}
 }
-}
+}
+}
+CleanupStack::PopAndDestroy( &availableIAPList );
 }
 // -----------------------------------------------------------------------------
 // CMPMIapSelection::CheckGprsServicesAllowedL
 // -----------------------------------------------------------------------------
 TInt                aError,
 const TMpmConnPref* aPolicyPref )
 {
 MPMLOGSTRING2( "CMPMIapSelection::ChooseIapComplete aError = %d", aError )
+if ( ( aError == KErrNone ) &&
+!( iChooseIapPref.NoteBehaviour() &
+TExtendedConnPref::ENoteBehaviourConnDisableNotes ) )
+{
+TConnectionState state =
+iSession->MyServer().CheckUsageOfIap( aPolicyPref->IapId(),
+iSession->ConnectionId() );
+TBool connectionAlreadyActive = (state == EStarted || state == EStarting || state == ERoaming);
+if ( !connectionAlreadyActive &&
+( iSession->IsMMSIap( aPolicyPref->IapId() ) == EFalse ) )
+{
+CConnectionUiUtilities* connUiUtils( NULL );
+TRAPD( popupError, connUiUtils = CConnectionUiUtilities::NewL() );
+if ( popupError == KErrNone )
+	    {
+	connUiUtils->ConnectingViaDiscreetPopup( aPolicyPref->IapId() );
+	delete connUiUtils;
+	    }
+}
+}
 if( iWlanDialog )
 {
 delete iWlanDialog;
 iWlanDialog = NULL;
 }
+iSession->ChooseIapComplete( aError, aPolicyPref );
 // Set choose iap state to none
 iChooseIapState = ENoConnection;
 iNextBestExists = EFalse;
 iUserSelectionSnapId = 0;
 iUserSelectionIapId = 0;
 iImplicitState = EImplicitStart;
-	iSession->ChooseIapComplete( aError, aPolicyPref );
 }
 // -----------------------------------------------------------------------------
 // CMPMIapSelection::UserWlanSelectionDoneL
 aError )
 ChooseIapComplete( aError, NULL );
 delete iDialog;
 iDialog = NULL;
-// Start ConnSelectionDlgTimer if user has cancelled the connection
-// selection dialog. During the timer interval dialog is not shown.
-//
-if( aError == KErrCancel )
-{
-iSession->MyServer().StartConnSelectionDlgTimer();
-}
 }
 // -----------------------------------------------------------------------------
 // CMPMIapSelection::HandleUserIapSelectionL
 void CMPMIapSelection::ImplicitConnectionIapSelectionL()
 {
 MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionIapSelectionL" )
 iSession->AvailableUnblacklistedIapsL( iStoredAvailableIaps, iSession->ConnectionId() );
-// Create and initiate user dialog only if it hasnot
+// Create and initiate user dialog
-// been cancelled in last 10s(KTimeout)
 //
-if ( !iSession->MyServer().IsConnSelectionDlgTimerOn() )
+iDialog = CMPMDialog::NewL( *this,
-{
-iDialog = CMPMDialog::NewL( *this,
 iStoredAvailableIaps,
 iChooseIapPref.BearerSet(),
 *iSession->MyServer().ConnectDialogQueue(),
 iSession->MyServer() );
-}
-else
-{
-MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionIapSelectionL, iConnSelectionDlgTimer running" )
-ChooseIapComplete( KErrCancel, NULL );
-}
 }
 // -----------------------------------------------------------------------------
 // CMPMIapSelection::ImplicitConnectionL
 // -----------------------------------------------------------------------------
 //
 void CMPMIapSelection::ImplicitConnectionL()
 {
 if( iImplicitState  == EImplicitStart )
 {
-MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionL EImplicitStart" )
+MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionIapSelectionL EImplicitStart" )
 iImplicitState = EImplicitWlanScan;
 ImplicitConnectionCheckWlanScanNeededL();
 }
 else if( iImplicitState  == EImplicitWlanScan )
 {
-MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionL EImplicitWlanScan" )
+MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionIapSelectionL EImplicitWlanScan" )
 iImplicitState = EImplicitUserSelection;
 ImplicitConnectionIapSelectionL();
 }
 else if( iImplicitState  == EImplicitUserSelection )
 {
-MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionL EImplicitUserSelection" )
+MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionIapSelectionL EImplicitUserSelection" )
 iImplicitState = EImplicitWlanQuery;
 ImplicitConnectionWlanNoteL();
 }
 else //EImplicitWlanQuery
 {
-MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionL EImplicitWlanQuery" )
+MPMLOGSTRING( "CMPMIapSelection::ImplicitConnectionIapSelectionL EImplicitWlanQuery" )
 CompleteImplicitConnectionL();
 }
 }
 // -----------------------------------------------------------------------------
 for ( TInt k = destCount; k >= 0; k-- )
 {
 ret = aAvailableIAPs.Find( destNetIaps[k].iIapId );
 if ( ret == KErrNotFound )
 {
-TBool isTunDriver = iCommsDatAccess->IsTunDriverIap(
+MPMLOGSTRING2( "CMPMIapSelection::ChooseBestIAPL: \
-destNetIaps[k].iIapId );
+Remove unavailable IAP = %i", destNetIaps[k].iIapId )
-if ( !isTunDriver )
+destNetIaps.Remove( k );
-{
-MPMLOGSTRING2( "CMPMIapSelection::ChooseBestIAPL: \
-Remove unavailable IAP = %i", destNetIaps[k].iIapId )
-destNetIaps.Remove( k );
-}
 }
 }
 // Remove any unavailable IAP from embeddedIaps
 //
 for ( TInt m = embedCount; m >= 0; m-- )
 {
 ret = aAvailableIAPs.Find( embeddedIaps[m].iIapId );
 if ( ret == KErrNotFound )
 {
-TBool isTunDriver = iCommsDatAccess->IsTunDriverIap( embeddedIaps[m].iIapId );
+// Remove IapId because it's not available
-if ( !isTunDriver )
+//
-{
+MPMLOGSTRING2( "CMPMIapSelection::ChooseBestIAPL: \
-// Remove IapId because it's not available
-MPMLOGSTRING2( "CMPMIapSelection::ChooseBestIAPL: \
 Remove unavailable IAP = %i", embeddedIaps[m].iIapId )
 embeddedIaps.Remove( m );
-}
 }
 }
 }
 // Determine the actual priorities for virtual IAPs and embedded Snaps

branch	RCL_3
changeset 69	cf1b3ddbe9a1
parent 65	14754bf06654