114 CmManager.ReadGenConnSettingsL( iSettings ); |
114 CmManager.ReadGenConnSettingsL( iSettings ); |
115 CleanupStack::PopAndDestroy( 1 ); //CmManager |
115 CleanupStack::PopAndDestroy( 1 ); //CmManager |
116 |
116 |
117 //Print out loaded settings |
117 //Print out loaded settings |
118 OstTrace1( TRACE_NORMAL, CSP_LOADSETTINGSL_USAGE_OF_NEW_WLAN_PARAM_TRACE, "iSettings.iUsageOfWlan=%d", iSettings.iUsageOfWlan ); |
118 OstTrace1( TRACE_NORMAL, CSP_LOADSETTINGSL_USAGE_OF_NEW_WLAN_PARAM_TRACE, "iSettings.iUsageOfWlan=%d", iSettings.iUsageOfWlan ); |
119 OstTrace1( TRACE_NORMAL, CSP_LOADSETTINGSL_SEAMLESSNESS_VISITOR_PARAM_TRACE, "iSeamlessnessVisitor=%d", iSettings.iSeamlessnessVisitor ); |
119 OstTrace1( TRACE_NORMAL, CSP_LOADSETTINGSL_CELLULAR_DATA_USAGE_VISITOR_PARAM_TRACE, "iSettings.iCellularDataUsageVisitor=%d", iSettings.iCellularDataUsageVisitor ); |
120 OstTrace1( TRACE_NORMAL, CSP_LOADSETTINGSL_SEAMLESSNESS_HOME_PARAM_TRACE, "iSettings.iSeamlessnessHome=%d", iSettings.iSeamlessnessHome ); |
120 OstTrace1( TRACE_NORMAL, CSP_LOADSETTINGSL_CELLULAR_DATA_USAGE_HOME_PARAM_TRACE, "iSettings.iCellularDataUsageHome=%d", iSettings.iCellularDataUsageHome ); |
121 } |
121 } |
122 |
122 |
123 // ---------------------------------------------------------------------------- |
123 // ---------------------------------------------------------------------------- |
124 // CGSConnSettingsPluginModel::SaveSettingsL |
124 // CGSConnSettingsPluginModel::SaveSettingsL |
125 // |
125 // |
134 CmManager.WriteGenConnSettingsL( iSettings ); |
134 CmManager.WriteGenConnSettingsL( iSettings ); |
135 CleanupStack::PopAndDestroy( 1 ); //CmManager |
135 CleanupStack::PopAndDestroy( 1 ); //CmManager |
136 |
136 |
137 //Print out saved settings |
137 //Print out saved settings |
138 OstTrace1( TRACE_NORMAL, CSP_SAVESETTINGSL_USAGE_OF_NEW_WLAN_PARAM_TRACE, "iSettings.iUsageOfWlan=%d", iSettings.iUsageOfWlan ); |
138 OstTrace1( TRACE_NORMAL, CSP_SAVESETTINGSL_USAGE_OF_NEW_WLAN_PARAM_TRACE, "iSettings.iUsageOfWlan=%d", iSettings.iUsageOfWlan ); |
139 OstTrace1( TRACE_NORMAL, CSP_SAVESETTINGSL_SEAMLESSNESS_VISITOR_PARAM_TRACE, "iSeamlessnessVisitor=%d", iSettings.iSeamlessnessVisitor ); |
139 OstTrace1( TRACE_NORMAL, CSP_SAVESETTINGSL_CELLULAR_DATA_USAGE_VISITOR_PARAM_TRACE, "iSettings.iCellularDataUsageVisitor=%d", iSettings.iCellularDataUsageVisitor ); |
140 OstTrace1( TRACE_NORMAL, CSP_SAVESETTINGSL_SEAMLESSNESS_HOME_PARAM_TRACE, "iSettings.iSeamlessnessHome=%d", iSettings.iSeamlessnessHome ); |
140 OstTrace1( TRACE_NORMAL, CSP_SAVESETTINGSL_CELLULAR_DATA_USAGE_HOME_PARAM_TRACE, "iSettings.iCellularDataUsageHome=%d", iSettings.iCellularDataUsageHome ); |
141 } |
141 } |
142 |
142 |
143 // ---------------------------------------------------------------------------- |
143 // ---------------------------------------------------------------------------- |
144 // CGSConnSettingsPluginModel::UsageOfWlan |
144 // CGSConnSettingsPluginModel::UsageOfWlan |
145 // |
145 // |
176 TInt CGSConnSettingsPluginModel::DataUsageAbroad() |
176 TInt CGSConnSettingsPluginModel::DataUsageAbroad() |
177 { |
177 { |
178 TInt mappedValue = 0; |
178 TInt mappedValue = 0; |
179 |
179 |
180 //Map to correct index |
180 //Map to correct index |
181 switch ( iSettings.iSeamlessnessVisitor ) |
181 switch ( iSettings.iCellularDataUsageVisitor ) |
182 { |
182 { |
183 case ECmSeamlessnessShowprogress: |
183 case ECmCellularDataUsageAutomatic: |
184 case ECmSeamlessnessFullySeamless: |
184 mappedValue = EDataUsageAbroadAutomatic; // Automatic |
185 mappedValue = EDataUsageAbroadAutomatic; //Automatic |
185 break; |
186 break; |
186 |
187 |
187 case ECmCellularDataUsageConfirm: |
188 case ECmSeamlessnessConfirmFirst: |
188 mappedValue = EDataUsageAbroadConfirm; // Confirm |
189 mappedValue = EDataUsageAbroadConfirm; //Confirm |
189 break; |
190 break; |
190 |
191 |
191 case ECmCellularDataUsageDisabled: |
192 case ECmSeamlessnessDisabled: |
192 mappedValue = EDataUsageAbroadWlanOnly; // Wlan only |
193 mappedValue = EDataUsageAbroadWlanOnly; //Wlan only |
|
194 break; |
193 break; |
195 |
194 |
196 default: |
195 default: |
197 break; |
196 break; |
198 } |
197 } |
208 TInt CGSConnSettingsPluginModel::DataUsageInHomeNw() |
207 TInt CGSConnSettingsPluginModel::DataUsageInHomeNw() |
209 { |
208 { |
210 TInt mappedValue = 0; |
209 TInt mappedValue = 0; |
211 |
210 |
212 //Map to correct index |
211 //Map to correct index |
213 switch ( iSettings.iSeamlessnessHome ) |
212 switch ( iSettings.iCellularDataUsageHome ) |
214 { |
213 { |
215 case ECmSeamlessnessShowprogress: |
214 case ECmCellularDataUsageAutomatic: |
216 case ECmSeamlessnessFullySeamless: |
215 mappedValue = EDataUsageHomeNwAutomatic; // Automatic |
217 mappedValue = EDataUsageHomeNwAutomatic; //Automatic |
216 break; |
218 break; |
217 |
219 |
218 case ECmCellularDataUsageConfirm: |
220 case ECmSeamlessnessConfirmFirst: |
219 mappedValue = EDataUsageHomeNwConfirm; // Confirm |
221 mappedValue = EDataUsageHomeNwConfirm; //Confirm |
220 break; |
222 break; |
221 |
223 |
222 case ECmCellularDataUsageDisabled: |
224 case ECmSeamlessnessDisabled: |
223 mappedValue = EDataUsageHomeNwWlanOnly; // Wlan only |
225 mappedValue = EDataUsageHomeNwWlanOnly; //Wlan only |
|
226 break; |
224 break; |
227 |
225 |
228 default: |
226 default: |
229 break; |
227 break; |
230 } |
228 } |
264 void CGSConnSettingsPluginModel::SetDataUsageAbroad( TInt aValue ) |
262 void CGSConnSettingsPluginModel::SetDataUsageAbroad( TInt aValue ) |
265 { |
263 { |
266 switch ( aValue ) |
264 switch ( aValue ) |
267 { |
265 { |
268 case EDataUsageAbroadAutomatic: //Automatic |
266 case EDataUsageAbroadAutomatic: //Automatic |
269 iSettings.iSeamlessnessVisitor = ECmSeamlessnessShowprogress; |
267 iSettings.iCellularDataUsageVisitor = ECmCellularDataUsageAutomatic; |
270 break; |
268 break; |
271 case EDataUsageAbroadConfirm: //Confirm |
269 case EDataUsageAbroadConfirm: //Confirm |
272 iSettings.iSeamlessnessVisitor = ECmSeamlessnessConfirmFirst; |
270 iSettings.iCellularDataUsageVisitor = ECmCellularDataUsageConfirm; |
273 break; |
271 break; |
274 |
272 |
275 case EDataUsageAbroadWlanOnly: //Wlan only |
273 case EDataUsageAbroadWlanOnly: //Wlan only |
276 iSettings.iSeamlessnessVisitor = ECmSeamlessnessDisabled; |
274 iSettings.iCellularDataUsageVisitor = ECmCellularDataUsageDisabled; |
277 break; |
275 break; |
278 |
276 |
279 default: |
277 default: |
280 break; |
278 break; |
281 } |
279 } |
290 void CGSConnSettingsPluginModel::SetDataUsageInHomeNw( TInt aValue ) |
288 void CGSConnSettingsPluginModel::SetDataUsageInHomeNw( TInt aValue ) |
291 { |
289 { |
292 switch ( aValue ) |
290 switch ( aValue ) |
293 { |
291 { |
294 case EDataUsageHomeNwAutomatic: //Automatic |
292 case EDataUsageHomeNwAutomatic: //Automatic |
295 iSettings.iSeamlessnessHome = ECmSeamlessnessShowprogress; |
293 iSettings.iCellularDataUsageHome = ECmCellularDataUsageAutomatic; |
296 break; |
294 break; |
297 |
295 |
298 case EDataUsageHomeNwConfirm: //Confirm |
296 case EDataUsageHomeNwConfirm: //Confirm |
299 iSettings.iSeamlessnessHome = ECmSeamlessnessConfirmFirst; |
297 iSettings.iCellularDataUsageHome = ECmCellularDataUsageConfirm; |
300 break; |
298 break; |
301 |
299 |
302 case EDataUsageHomeNwWlanOnly: //Wlan only |
300 case EDataUsageHomeNwWlanOnly: //Wlan only |
303 iSettings.iSeamlessnessHome = ECmSeamlessnessDisabled; |
301 iSettings.iCellularDataUsageHome = ECmCellularDataUsageDisabled; |
304 break; |
302 break; |
305 |
303 |
306 default: |
304 default: |
307 break; |
305 break; |
308 } |
306 } |