equal
deleted
inserted
replaced
351 // When application is starting an IAP confirmation is asked only when roaming. |
351 // When application is starting an IAP confirmation is asked only when roaming. |
352 // This is skipped for VPN (= virtual) IAPs |
352 // This is skipped for VPN (= virtual) IAPs |
353 if ( iSession->IsConfirmFirstL( validateIapId ) && |
353 if ( iSession->IsConfirmFirstL( validateIapId ) && |
354 !( iSession->MyServer().CommsDatAccess()->IsVirtualIapL( validateIapId ) )) |
354 !( iSession->MyServer().CommsDatAccess()->IsVirtualIapL( validateIapId ) )) |
355 { |
355 { |
356 |
356 // Check that queries aren't disabled and |
357 // Check whether queries are enabled |
357 // enough time has elapsed from the last query cancelled by the user. |
358 if ( !( iChooseIapPref.NoteBehaviour() |
358 if ( !( iChooseIapPref.NoteBehaviour() |
359 & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) ) |
359 & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) && |
|
360 !iSession->MyServer().IsConnPermQueryTimerOn() ) |
360 { |
361 { |
361 |
|
362 TConnectionId connId = iSession->ConnectionId(); |
362 TConnectionId connId = iSession->ConnectionId(); |
363 |
363 |
364 // Set confirmation type based on roaming status |
364 // Set confirmation type based on roaming status |
365 CMPMConfirmDlg::TDialogType type = |
365 CMPMConfirmDlg::TDialogType type = |
366 CMPMConfirmDlg::EConfirmDlgHomeNetwork; |
366 CMPMConfirmDlg::EConfirmDlgHomeNetwork; |
510 // This is skipped for VPN (= virtual) IAPs |
510 // This is skipped for VPN (= virtual) IAPs |
511 if ( ( iSession->IsConfirmFirstL( validateIapId ) ) && |
511 if ( ( iSession->IsConfirmFirstL( validateIapId ) ) && |
512 ( iSession->MyServer().CommsDatAccess()->CheckWlanL( validateIapId ) == ENotWlanIap ) && |
512 ( iSession->MyServer().CommsDatAccess()->CheckWlanL( validateIapId ) == ENotWlanIap ) && |
513 !( iSession->MyServer().CommsDatAccess()->IsVirtualIapL( validateIapId ) ) ) |
513 !( iSession->MyServer().CommsDatAccess()->IsVirtualIapL( validateIapId ) ) ) |
514 { |
514 { |
515 // Check whether queries are disabled |
515 // Check that queries aren't disabled and |
516 if ( !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) ) |
516 // enough time has elapsed from the last query cancelled by the user. |
|
517 if ( !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) && |
|
518 !iSession->MyServer().IsConnPermQueryTimerOn() ) |
517 { |
519 { |
518 if ( iSession->MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
520 if ( iSession->MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
519 { |
521 { |
520 // International roaming |
522 // International roaming |
521 iConfirmDlgStarting = CMPMConfirmDlgStarting::NewL( |
523 iConfirmDlgStarting = CMPMConfirmDlgStarting::NewL( |
789 { |
791 { |
790 // Check if we are roaming and cellular data usage query has not yet been presented |
792 // Check if we are roaming and cellular data usage query has not yet been presented |
791 // to the user in this country |
793 // to the user in this country |
792 if ( iSession->MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
794 if ( iSession->MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
793 { |
795 { |
794 // Check whether queries are enabled |
796 // Check that queries aren't disabled and |
795 if ( !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) ) |
797 // enough time has elapsed from the last query cancelled by the user. |
|
798 if ( !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) && |
|
799 !iSession->MyServer().IsConnPermQueryTimerOn() ) |
796 { |
800 { |
797 TConnectionId connId = iSession->ConnectionId(); |
801 TConnectionId connId = iSession->ConnectionId(); |
798 |
802 |
799 // International roaming |
803 // International roaming |
800 iConfirmDlgStarting = CMPMConfirmDlgStarting::NewL( |
804 iConfirmDlgStarting = CMPMConfirmDlgStarting::NewL( |