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

* wrap all m_reach in the iOS 12+ else block

* update initial status even if net detect is disabled

---------

Co-authored-by: Tommy Meisel <[email protected]>

Author: thomasameisel

lib/pal/posix/NetworkInformationImpl.mm

@@ -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();
@@ -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];
+            }
         }
     }