equal
deleted
inserted
replaced
800 { |
800 { |
801 // if user-defined access point then check that access point still exists. |
801 // if user-defined access point then check that access point still exists. |
802 // if it doesn't, reset access point to always ask and homepage to blank access point home page. |
802 // if it doesn't, reset access point to always ask and homepage to blank access point home page. |
803 CApListItem* apItem = iCommsModel.AccessPointsL()->ItemForUid( aDefaultAccessPoint ); |
803 CApListItem* apItem = iCommsModel.AccessPointsL()->ItemForUid( aDefaultAccessPoint ); |
804 if (apItem == NULL) |
804 if (apItem == NULL) |
805 { |
|
806 if( iVpnEngine->IsVpnApL( aDefaultAccessPoint ) ) |
|
807 { |
805 { |
808 BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) ); |
806 TBool isVpn = EFalse; |
809 break; |
807 TRAPD(leaveCode, isVpn = iVpnEngine->IsVpnApL( aDefaultAccessPoint )) |
810 } |
808 if ( leaveCode == KErrNone ) |
|
809 { |
|
810 if ( isVpn ) |
|
811 { |
|
812 BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) ); |
|
813 break; |
|
814 } |
|
815 } |
811 aDefaultAccessPoint = KWmlNoDefaultAccessPoint; |
816 aDefaultAccessPoint = KWmlNoDefaultAccessPoint; |
812 aAssocVpn = KWmlNoDefaultAccessPoint; |
817 aAssocVpn = KWmlNoDefaultAccessPoint; |
813 delete iAllPreferences.iDefaultAPDetails; |
818 delete iAllPreferences.iDefaultAPDetails; |
814 iAllPreferences.iDefaultAPDetails = NULL; |
819 iAllPreferences.iDefaultAPDetails = NULL; |
815 SetAccessPointSelectionModeL(EAlwaysAsk ); |
820 SetAccessPointSelectionModeL(EAlwaysAsk ); |