equal
deleted
inserted
replaced
491 ChooseBestIAPL( iChooseIapPref, availableIAPList, iNextBestExists ); |
491 ChooseBestIAPL( iChooseIapPref, availableIAPList, iNextBestExists ); |
492 TUint32 validateIapId = iChooseIapPref.IapId(); |
492 TUint32 validateIapId = iChooseIapPref.IapId(); |
493 // Check if any suitable IAP's were found, if not then complete selection with error code |
493 // Check if any suitable IAP's were found, if not then complete selection with error code |
494 if ( validateIapId == 0 ) |
494 if ( validateIapId == 0 ) |
495 { |
495 { |
496 if ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault || |
496 if ( !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) && |
|
497 ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault || |
497 ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeExplicit && |
498 ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeExplicit && |
498 !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) && |
499 iCommsDatAccess->IsInternetSnapL( 0, snap ) ) ) ) |
499 iCommsDatAccess->IsInternetSnapL( 0, snap ) ) ) |
|
500 { |
500 { |
501 ImplicitConnectionL(); |
501 ImplicitConnectionL(); |
502 } |
502 } |
503 else |
503 else |
504 { |
504 { |
738 TExtendedConnPref::ENoteBehaviourConnDisableNotes ) ) |
738 TExtendedConnPref::ENoteBehaviourConnDisableNotes ) ) |
739 { |
739 { |
740 TBool connectionAlreadyActive = |
740 TBool connectionAlreadyActive = |
741 iSession->MyServer().CheckIfStarted( aPolicyPref->IapId(), |
741 iSession->MyServer().CheckIfStarted( aPolicyPref->IapId(), |
742 iSession->ConnectionId() ); |
742 iSession->ConnectionId() ); |
743 CConnectionUiUtilities* connUiUtils = NULL; |
|
744 if ( !connectionAlreadyActive && |
743 if ( !connectionAlreadyActive && |
745 ( iSession->IsMMSIap( aPolicyPref->IapId() ) == EFalse ) ) |
744 ( iSession->IsMMSIap( aPolicyPref->IapId() ) == EFalse ) ) |
746 { |
745 { |
747 TRAPD( popupError, |
746 CConnectionUiUtilities* connUiUtils; |
748 connUiUtils = CConnectionUiUtilities::NewL(); |
747 TRAPD( popupError, connUiUtils = CConnectionUiUtilities::NewL() ); |
749 connUiUtils->ConnectingViaDiscreetPopup( |
748 if ( popupError == KErrNone ) |
750 aPolicyPref->IapId()); |
749 { |
751 delete connUiUtils; ); |
750 connUiUtils->ConnectingViaDiscreetPopup( aPolicyPref->IapId() ); |
752 if ( popupError && connUiUtils ) |
751 delete connUiUtils; |
753 { |
752 } |
754 delete connUiUtils; |
753 } |
755 } |
754 } |
756 } |
|
757 } |
|
758 |
755 |
759 if( iWlanDialog ) |
756 if( iWlanDialog ) |
760 { |
757 { |
761 delete iWlanDialog; |
758 delete iWlanDialog; |
762 iWlanDialog = NULL; |
759 iWlanDialog = NULL; |