equal
deleted
inserted
replaced
996 |
996 |
997 if (item->Profile().Status() == CSIPConcreteProfile::ERegistered) |
997 if (item->Profile().Status() == CSIPConcreteProfile::ERegistered) |
998 { |
998 { |
999 status = CSIPConcreteProfile::EUnregistrationInProgress; |
999 status = CSIPConcreteProfile::EUnregistrationInProgress; |
1000 } |
1000 } |
1001 if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn)) |
1001 if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching)) |
1002 { |
1002 { |
1003 if(item->LatestProfile().IapId()!= item->UsedProfile().IapId()) |
1003 if(item->LatestProfile().IapId()!= item->UsedProfile().IapId()) |
1004 { |
1004 { |
1005 item->SetApnSelected(EFalse); |
1005 item->SetApnSelected(EFalse); |
1006 } |
1006 } |
1026 } |
1026 } |
1027 } |
1027 } |
1028 } |
1028 } |
1029 |
1029 |
1030 |
1030 |
1031 if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn) |
1031 if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching) |
1032 && item->IsApnSwitchEnabled()) |
1032 && item->IsApnSwitchEnabled()) |
1033 { |
1033 { |
1034 PROFILE_DEBUG1("CSIPProfileServerCore::UpdateRegistrationL, SwichEnabled") |
1034 PROFILE_DEBUG1("CSIPProfileServerCore::UpdateRegistrationL, SwichEnabled") |
1035 if(CheckIapSettings( item->LatestProfile().Id())) |
1035 if(CheckIapSettings( item->LatestProfile().Id())) |
1036 { |
1036 { |
1074 CSIPProfileCacheItem* item = ProfileCacheItemL(aProfileId); |
1074 CSIPProfileCacheItem* item = ProfileCacheItemL(aProfileId); |
1075 TBool isVpnInUse = (FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn ) |
1075 TBool isVpnInUse = (FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn ) |
1076 && item->IsVpnInUse()); |
1076 && item->IsVpnInUse()); |
1077 |
1077 |
1078 const CSIPConcreteProfile* profile = Profile(aProfileId); |
1078 const CSIPConcreteProfile* profile = Profile(aProfileId); |
1079 if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn ) |
1079 if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching ) |
1080 && CheckApnSwitchEnabledL( *profile ) && !item->IsRfsInprogress() && !isVpnInUse ) |
1080 && CheckApnSwitchEnabledL( *profile ) && !item->IsRfsInprogress() && !isVpnInUse ) |
1081 { |
1081 { |
1082 PROFILE_DEBUG1("CSIPProfileServerCore::EnableProfileL, SwichEnabled") |
1082 PROFILE_DEBUG1("CSIPProfileServerCore::EnableProfileL, SwichEnabled") |
1083 if(CheckIapSettings( aProfileId )) |
1083 if(CheckIapSettings( aProfileId )) |
1084 { |
1084 { |
1172 CSIPProfileCacheItem* item = iProfileCache[i]; |
1172 CSIPProfileCacheItem* item = iProfileCache[i]; |
1173 if (item->Profile().IsAutoRegistrationEnabled()) |
1173 if (item->Profile().IsAutoRegistrationEnabled()) |
1174 { |
1174 { |
1175 TBool enabled(EFalse); |
1175 TBool enabled(EFalse); |
1176 TRAPD(error, enabled = CheckApnSwitchEnabledL(item->Profile())) |
1176 TRAPD(error, enabled = CheckApnSwitchEnabledL(item->Profile())) |
1177 if(FeatureManager::FeatureSupported( KFeatureIdFfImsDeregistrationInVpn ) |
1177 if(FeatureManager::FeatureSupported( KFeatureIdFfSipApnSwitching ) |
1178 &&enabled && !error) |
1178 &&enabled && !error) |
1179 { |
1179 { |
1180 PROFILE_DEBUG1("CSIPProfileServerCore::RegisterProfiles, SwichEnabled") |
1180 PROFILE_DEBUG1("CSIPProfileServerCore::RegisterProfiles, SwichEnabled") |
1181 if(CheckIapSettings( item->Profile().Id())) |
1181 if(CheckIapSettings( item->Profile().Id())) |
1182 { |
1182 { |