Skip to content

Wrap all ODWReachability in the iOS 12+ else block #1398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lalitb merged 2 commits into from
Jan 5, 2026
Merged

Wrap all ODWReachability in the iOS 12+ else block #1398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
686153d
wrap all m_reach in the iOS 12+ else block
Jan 5, 2026
7a8beb8
update initial status even if net detect is disabled
Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 42 additions & 39 deletions lib/pal/posix/NetworkInformationImpl.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,37 +103,6 @@ virtual NetworkCost GetNetworkCost()

void NetworkInformation::SetupNetDetect()
{
auto weak_this = std::weak_ptr<NetworkInformation>(shared_from_this());

m_reach = [ODWReachability reachabilityForInternetConnection];
void (^block)(NSNotification*) = ^(NSNotification*)
{
auto strong_this = weak_this.lock();
if (!strong_this)
{
return;
}

// NetworkCost information is not available until iOS 12.
// Just make the best guess here.
switch (m_reach.currentReachabilityStatus)
{
case NotReachable:
strong_this->UpdateType(NetworkType_Unknown);
strong_this->UpdateCost(NetworkCost_Unknown);
break;
case ReachableViaWiFi:
strong_this->UpdateType(NetworkType_Wifi);
strong_this->UpdateCost(NetworkCost_Unmetered);
break;
case ReachableViaWWAN:
strong_this->UpdateType(NetworkType_WWAN);
strong_this->UpdateCost(NetworkCost_Metered);
break;
}
};
block(nil); // Update the initial status.

if (@available(macOS 10.14, iOS 12.0, *))
{
m_monitor = nw_path_monitor_create();
Expand Down Expand Up @@ -186,15 +155,49 @@ virtual NetworkCost GetNetworkCost()
nw_path_monitor_cancel(m_monitor);
}
}
else if (m_isNetDetectEnabled)
else
{
m_notificationId =
[[NSNotificationCenter defaultCenter]
addObserverForName: kNetworkReachabilityChangedNotification
object: nil
queue: nil
usingBlock: block];
[m_reach startNotifier];
auto weak_this = std::weak_ptr<NetworkInformation>(shared_from_this());

m_reach = [ODWReachability reachabilityForInternetConnection];
void (^block)(NSNotification*) = ^(NSNotification*)
{
auto strong_this = weak_this.lock();
if (!strong_this)
{
return;
}

// NetworkCost information is not available until iOS 12.
// Just make the best guess here.
switch (m_reach.currentReachabilityStatus)
{
case NotReachable:
strong_this->UpdateType(NetworkType_Unknown);
strong_this->UpdateCost(NetworkCost_Unknown);
break;
case ReachableViaWiFi:
strong_this->UpdateType(NetworkType_Wifi);
strong_this->UpdateCost(NetworkCost_Unmetered);
break;
case ReachableViaWWAN:
strong_this->UpdateType(NetworkType_WWAN);
strong_this->UpdateCost(NetworkCost_Metered);
break;
}
};
block(nil); // Update the initial status.

if (m_isNetDetectEnabled)
{
m_notificationId =
[[NSNotificationCenter defaultCenter]
addObserverForName: kNetworkReachabilityChangedNotification
object: nil
queue: nil
usingBlock: block];
[m_reach startNotifier];
}
}
}

Expand Down
Loading