836 "CMPMServerSession::IsConfirmFirstL - background IAP, \ |
836 "CMPMServerSession::IsConfirmFirstL - background IAP, \ |
837 should not be confirmed - False" ) |
837 should not be confirmed - False" ) |
838 return EFalse; |
838 return EFalse; |
839 } |
839 } |
840 |
840 |
841 // Read global OCC seamlessness values from CommsDat's DefConn table |
841 // Read global cellular data usage values from CommsDat's DefConn table |
842 genConnSettings = iMyServer.CommsDatAccess()->ReadGenConnSettingsL(); |
842 genConnSettings = iMyServer.CommsDatAccess()->ReadGenConnSettingsL(); |
843 |
843 |
844 TUint32 currentSeamlessness( genConnSettings.iSeamlessnessHome ); |
844 TUint32 currentDataUsage( genConnSettings.iCellularDataUsageHome ); |
845 |
845 |
846 if ( iMyServer.IsVisitorNetwork() ) |
846 if ( iMyServer.IsVisitorNetwork() ) |
847 { |
847 { |
848 currentSeamlessness = genConnSettings.iSeamlessnessVisitor; |
848 currentDataUsage = genConnSettings.iCellularDataUsageVisitor; |
849 } |
849 } |
850 |
850 |
851 if ( currentSeamlessness == ECmSeamlessnessShowprogress || |
851 if ( currentDataUsage == ECmCellularDataUsageConfirm ) |
852 currentSeamlessness == ECmSeamlessnessFullySeamless ) |
852 { |
|
853 MPMLOGSTRING( "CMPMServerSession::IsConfirmFirstL - True" ) |
|
854 isConfirmFirst = ETrue; |
|
855 } |
|
856 else |
853 { |
857 { |
854 MPMLOGSTRING( "CMPMServerSession::IsConfirmFirstL - False" ) |
858 MPMLOGSTRING( "CMPMServerSession::IsConfirmFirstL - False" ) |
855 isConfirmFirst = EFalse; |
859 } |
856 } |
860 |
857 else |
|
858 { |
|
859 // The currentSeamlessness value ECmSeamlessnessConfirmFirst |
|
860 // matches with need to display confirmation dialog. |
|
861 // |
|
862 MPMLOGSTRING( |
|
863 "CMPMServerSession::IsConfirmFirstL - True" ) |
|
864 isConfirmFirst = ETrue; |
|
865 } |
|
866 return isConfirmFirst; |
861 return isConfirmFirst; |
867 } |
862 } |
868 |
863 |
869 |
864 |
870 // ----------------------------------------------------------------------------- |
865 // ----------------------------------------------------------------------------- |
1104 TRAPD(errorCode,genConnSettings = MyServer().CommsDatAccess()->ReadGenConnSettingsL()); // call a function |
1099 TRAPD(errorCode,genConnSettings = MyServer().CommsDatAccess()->ReadGenConnSettingsL()); // call a function |
1105 |
1100 |
1106 //If reading of database failed we do not write back to the database to prevent random values |
1101 //If reading of database failed we do not write back to the database to prevent random values |
1107 if (errorCode == KErrNone) |
1102 if (errorCode == KErrNone) |
1108 { |
1103 { |
1109 genConnSettings.iSeamlessnessHome = ECmSeamlessnessShowprogress; |
1104 genConnSettings.iCellularDataUsageHome = ECmCellularDataUsageAutomatic; |
1110 TRAP_IGNORE(MyServer().CommsDatAccess()->WriteGenConnSettingsL( genConnSettings )); |
1105 TRAP_IGNORE(MyServer().CommsDatAccess()->WriteGenConnSettingsL( genConnSettings )); |
1111 } |
1106 } |
1112 } |
1107 } |
1113 else |
1108 else |
1114 { |
1109 { |
3542 { |
3537 { |
3543 TCmGenConnSettings genConnSettings; |
3538 TCmGenConnSettings genConnSettings; |
3544 |
3539 |
3545 MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL") |
3540 MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL") |
3546 |
3541 |
3547 // Read global OCC seamlessness values from CommsDat's DefConn table |
3542 // Read global cellular data usage values from CommsDat's DefConn table |
3548 genConnSettings = iMyServer.CommsDatAccess()->ReadGenConnSettingsL(); |
3543 genConnSettings = iMyServer.CommsDatAccess()->ReadGenConnSettingsL(); |
3549 |
3544 |
3550 // Find out if new wlans can be prompted |
3545 // Find out if new wlans can be prompted |
3551 if ( genConnSettings.iUsageOfWlan == ECmUsageOfWlanKnownAndNew ) |
3546 if ( genConnSettings.iUsageOfWlan == ECmUsageOfWlanKnownAndNew ) |
3552 { |
3547 { |
3558 aNewWlansAllowed = EFalse; |
3553 aNewWlansAllowed = EFalse; |
3559 MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL: aNewWlansAllowed: False" ) |
3554 MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL: aNewWlansAllowed: False" ) |
3560 } |
3555 } |
3561 |
3556 |
3562 // Find out is only WLAN connection is allowed in current network |
3557 // Find out is only WLAN connection is allowed in current network |
3563 TUint32 currentSeamlessness( genConnSettings.iSeamlessnessHome ); |
3558 TUint32 currentCellularDataUsage( genConnSettings.iCellularDataUsageHome ); |
3564 |
3559 |
3565 if ( iMyServer.IsVisitorNetwork() ) |
3560 if ( iMyServer.IsVisitorNetwork() ) |
3566 { |
3561 { |
3567 currentSeamlessness = genConnSettings.iSeamlessnessVisitor; |
3562 currentCellularDataUsage = genConnSettings.iCellularDataUsageVisitor; |
3568 } |
3563 } |
3569 |
3564 |
3570 if ( currentSeamlessness == ECmSeamlessnessDisabled ) |
3565 if ( currentCellularDataUsage == ECmCellularDataUsageDisabled ) |
3571 { |
3566 { |
3572 MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL: True" ) |
3567 MPMLOGSTRING( "CMPMServerSession::IsWlanOnlyL: True" ) |
3573 return ETrue; |
3568 return ETrue; |
3574 } |
3569 } |
3575 else |
3570 else |