equal
deleted
inserted
replaced
931 { |
931 { |
932 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) ) |
932 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) ) |
933 { |
933 { |
934 if ( MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
934 if ( MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming ) |
935 { |
935 { |
936 //Check if cellular data usage query has already been presented to the user in this country |
936 //International roaming |
937 if ( MyServer().RoamingWatcher()->AskCellularDataUsageAbroad() == true ) |
937 iConfirmDlgRoaming = CMPMConfirmDlgRoaming::NewL( |
938 { |
938 *this, |
939 //International roaming |
939 snapId, |
940 iConfirmDlgRoaming = CMPMConfirmDlgRoaming::NewL( |
940 iMigrateIap, |
941 *this, |
941 CMPMConfirmDlg::EConfirmDlgVisitorNetwork, |
942 snapId, |
942 reconnect ); |
943 iMigrateIap, |
|
944 CMPMConfirmDlg::EConfirmDlgVisitorNetwork, |
|
945 reconnect ); |
|
946 } |
|
947 else |
|
948 { |
|
949 //Handle like user would have answered "Connect this time" to dialog |
|
950 RoamingConfirmationCompletedL( KErrNone, EMsgQueryThisTime, reconnect ); |
|
951 } |
|
952 } |
943 } |
953 else |
944 else |
954 { |
945 { |
955 //Home network |
946 //Home network |
956 iConfirmDlgRoaming = CMPMConfirmDlgRoaming::NewL( |
947 iConfirmDlgRoaming = CMPMConfirmDlgRoaming::NewL( |
1103 { |
1094 { |
1104 genConnSettings.iCellularDataUsageHome = ECmCellularDataUsageAutomatic; |
1095 genConnSettings.iCellularDataUsageHome = ECmCellularDataUsageAutomatic; |
1105 TRAP_IGNORE(MyServer().CommsDatAccess()->WriteGenConnSettingsL( genConnSettings )); |
1096 TRAP_IGNORE(MyServer().CommsDatAccess()->WriteGenConnSettingsL( genConnSettings )); |
1106 } |
1097 } |
1107 } |
1098 } |
1108 else |
|
1109 { |
|
1110 //In foreign country connect automatically is not stored in commsdat |
|
1111 //even user selected so. We just do not ask confirmation for the cellular |
|
1112 //connection again in this country: |
|
1113 MyServer().RoamingWatcher()->SetAskCellularDataUsageAbroad( false ); |
|
1114 } |
|
1115 } |
1099 } |
1116 |
1100 |
1117 //user selected connect this time |
1101 //user selected connect this time |
1118 else |
1102 else |
1119 { |
1103 { |
2839 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & |
2823 if ( !( iIapSelection->MpmConnPref().NoteBehaviour() & |
2840 TExtendedConnPref::ENoteBehaviourConnDisableNotes) ) |
2824 TExtendedConnPref::ENoteBehaviourConnDisableNotes) ) |
2841 { |
2825 { |
2842 TBool connectionAlreadyActive = iMyServer.CheckIfStarted( aIapId ); |
2826 TBool connectionAlreadyActive = iMyServer.CheckIfStarted( aIapId ); |
2843 CConnectionUiUtilities* connUiUtils = NULL; |
2827 CConnectionUiUtilities* connUiUtils = NULL; |
2844 TRAPD( popupError, |
2828 if (!connectionAlreadyActive ) |
2845 connUiUtils = CConnectionUiUtilities::NewL(); |
2829 { |
2846 connUiUtils->ConnectingViaDiscreetPopup( |
2830 TRAPD( popupError, |
2847 aIapId, |
2831 connUiUtils = CConnectionUiUtilities::NewL(); |
2848 connectionAlreadyActive ); |
2832 connUiUtils->ConnectingViaDiscreetPopup( |
2849 delete connUiUtils; ); |
2833 aIapId ); |
2850 if ( popupError && connUiUtils ) |
2834 delete connUiUtils; ); |
2851 { |
2835 if ( popupError && connUiUtils ) |
2852 delete connUiUtils; |
2836 { |
|
2837 delete connUiUtils; |
|
2838 } |
2853 } |
2839 } |
2854 } |
2840 } |
2855 |
2841 |
2856 TMpmNotificationStartIAP notifInfo; |
2842 TMpmNotificationStartIAP notifInfo; |
2857 notifInfo.iMPMNotificationType = EMPMStartIAPNotification; |
2843 notifInfo.iMPMNotificationType = EMPMStartIAPNotification; |