equal
deleted
inserted
replaced
811 aIapId, |
811 aIapId, |
812 iConnId ) |
812 iConnId ) |
813 |
813 |
814 // check whether a started connection exists which already |
814 // check whether a started connection exists which already |
815 // uses this IAP. If so, it won't need to be confirmed again |
815 // uses this IAP. If so, it won't need to be confirmed again |
816 // |
816 // |
817 if( iMyServer.CheckIfStarted( aIapId, iConnId ) ) |
817 TConnectionState state = iMyServer.CheckUsageOfIap( aIapId, iConnId ); |
|
818 |
|
819 if ( state == EStarted || state == EStarting || state == ERoaming ) |
818 { |
820 { |
819 MPMLOGSTRING( |
821 MPMLOGSTRING( |
820 "CMPMServerSession::IsConfirmFirstL - IAP already started, \ |
822 "CMPMServerSession::IsConfirmFirstL - IAP already started, \ |
821 confirm not necesary - False" ) |
823 confirm not necesary - False" ) |
822 return EFalse; |
824 return EFalse; |
2870 |
2872 |
2871 // Show the connecting discreet popup to the user when migrating to another iap |
2873 // Show the connecting discreet popup to the user when migrating to another iap |
2872 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & |
2874 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & |
2873 TExtendedConnPref::ENoteBehaviourConnDisableNotes) ) |
2875 TExtendedConnPref::ENoteBehaviourConnDisableNotes) ) |
2874 { |
2876 { |
2875 TBool connectionAlreadyActive = iMyServer.CheckIfStarted( aIapId, iConnId ); |
2877 TConnectionState state = iMyServer.CheckUsageOfIap( aIapId, iConnId ); |
|
2878 TBool connectionAlreadyActive = (state == EStarted || state == EStarting || state == ERoaming); |
2876 CConnectionUiUtilities* connUiUtils = NULL; |
2879 CConnectionUiUtilities* connUiUtils = NULL; |
2877 if (!connectionAlreadyActive ) |
2880 if (!connectionAlreadyActive ) |
2878 { |
2881 { |
2879 TRAPD( popupError, |
2882 TRAPD( popupError, |
2880 connUiUtils = CConnectionUiUtilities::NewL(); |
2883 connUiUtils = CConnectionUiUtilities::NewL(); |