pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[MAPSME-3810] Review fixes.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-02-13 12:12:23 +03:00 • committed by Sergey Yershov
parent 0ffbea93c3
commit 1b251a1415
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
iphone/Maps/Core/NetworkPolicy/MWMNetworkPolicy.mm
View file

@ -81,13 +81,17 @@ np::Stage GetStage()
bool CanUseNetwork()
{
auto const connectionType = GetPlatform().ConnectionStatus();
if (connectionType == Platform::EConnectionType::CONNECTION_NONE)
return false;
if (connectionType == Platform::EConnectionType::CONNECTION_WIFI)
return true;
NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];
NSDate * policyDate = [ud objectForKey:kNetworkingPolicyTimeStamp];
return [policyDate compare:[NSDate date]] == NSOrderedDescending;
using ct = Platform::EConnectionType;
switch (GetPlatform().ConnectionStatus())
{
case ct::CONNECTION_NONE: return false;
case ct::CONNECTION_WIFI: return true;
case ct::CONNECTION_WWAN:
{
NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];
NSDate * policyDate = [ud objectForKey:kNetworkingPolicyTimeStamp];
return [policyDate compare:[NSDate date]] == NSOrderedDescending;
}
}
}
} // namespace network_policy

3
iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
View file

@ -78,8 +78,7 @@ using namespace place_page;
NSAssert(!m_previewRows.empty(), @"Preview row's can't be empty!");
m_previewRows.push_back(PreviewRows::Space);
BOOL const hasBanner = m_info.GetBanner().m_type != banners::Banner::Type::None;
if (hasBanner && network_policy::CanUseNetwork() && ![MWMSettings adForbidden])
if (network_policy::CanUseNetwork() && ![MWMSettings adForbidden] && m_info.HasBanner())
m_previewRows.push_back(PreviewRows::Banner);
}