[connectivity_plus_macos] backport to macOS 10.11

packages/connectivity_plus/connectivity_plus/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.0
+
+- [MacOS]: Backport to macOS 10.11
+
 ## 1.3.0
 
 - Add ethernet as connectivity result. Supported on Android, iOS, Windows, Linux, macOS, and Web

packages/connectivity_plus/connectivity_plus/example/macos/Runner.xcodeproj/project.pbxproj

@@ -414,7 +414,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -497,7 +497,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -544,7 +544,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;

packages/connectivity_plus/connectivity_plus/macos/connectivity_plus.podspec

@@ -19,6 +19,5 @@ Pod::Spec.new do |s|
   s.public_header_files = 'Classes/**/*.h'
 
   s.platform = :osx
-  s.osx.deployment_target = '10.14'
+  s.osx.deployment_target = '10.11'
 end
-

packages/connectivity_plus/connectivity_plus/pubspec.yaml

@@ -1,6 +1,6 @@
 name: connectivity_plus
 description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS.
-version: 1.3.0
+version: 1.4.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
@@ -31,7 +31,7 @@ dependencies:
   meta: ^1.3.0
   connectivity_plus_platform_interface: ^1.1.0
   connectivity_plus_linux: ^1.1.0
-  connectivity_plus_macos: ^1.1.0
+  connectivity_plus_macos: ^1.2.0
   connectivity_plus_web: ^1.1.0
   connectivity_plus_windows: ^1.2.0
 

packages/connectivity_plus/connectivity_plus_macos/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.0
+
+- Backport to macOS 10.11
+
 ## 1.1.0
 
 - Add ethernet as connectivity result.

packages/connectivity_plus/connectivity_plus_macos/macos/Classes/ConnectivityPlugin.swift

@@ -14,16 +14,15 @@
 
 import Cocoa
 import FlutterMacOS
-import Network
-import SystemConfiguration.CaptiveNetwork
 
 public class ConnectivityPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
-  var eventSink: FlutterEventSink?
-  var pathMonitor = NWPathMonitor()
+  private let connectivityProvider: ConnectivityProvider
+  private var eventSink: FlutterEventSink?
 
-  override init() {
+  init(connectivityProvider: ConnectivityProvider) {
+    self.connectivityProvider = connectivityProvider
     super.init()
-    pathMonitor.pathUpdateHandler = pathUpdateHandler
+    self.connectivityProvider.connectivityUpdateHandler = connectivityUpdateHandler
   }
 
   public static func register(with registrar: FlutterPluginRegistrar) {
@@ -35,7 +34,14 @@ public class ConnectivityPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
       name: "dev.fluttercommunity.plus/connectivity_status",
       binaryMessenger: registrar.messenger)
 
-    let instance = ConnectivityPlugin()
+    let connectivityProvider: ConnectivityProvider
+    if #available(macOS 10.14, *) {
+      connectivityProvider = PathMonitorConnectivityProvider()
+    } else {
+      connectivityProvider = ReachabilityConnectivityProvider()
+    }
+
+    let instance = ConnectivityPlugin(connectivityProvider: connectivityProvider)
     streamChannel.setStreamHandler(instance)
 
     registrar.addMethodCallDelegate(instance, channel: channel)
@@ -44,45 +50,41 @@ public class ConnectivityPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
   public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
     switch call.method {
     case "check":
-      result(statusFromPath(path: pathMonitor.currentPath))
+      result(statusFrom(connectivityType: connectivityProvider.currentConnectivityType))
     default:
       result(FlutterMethodNotImplemented)
     }
   }
 
-  /// Returns a string describing connection type
-  ///
-  /// - Parameters:
-  ///   - path: an instance of NWPath
-  /// - Returns: connection type string
-  private func statusFromPath(path: NWPath) -> String {
-    if path.status == .satisfied {
-        if path.usesInterfaceType(.wifi) {
-            return "wifi"
-        } else if path.usesInterfaceType(.cellular) {
-            return "mobile"
-        } else if path.usesInterfaceType(.wiredEthernet) {
-            return "ethernet"
-        }
+  private func statusFrom(connectivityType: ConnectivityType) -> String {
+    switch connectivityType {
+    case .wifi:
+      return "wifi"
+    case .cellular:
+      return "mobile"
+    case .wiredEthernet:
+      return "ethernet"
+    case .none:
+      return "none"
     }
-    return "none"
   }
 
   public func onListen(
     withArguments _: Any?,
     eventSink events: @escaping FlutterEventSink
   ) -> FlutterError? {
     eventSink = events
-    pathMonitor.start(queue: .global(qos: .background))
+    connectivityProvider.start()
+    connectivityUpdateHandler(connectivityType: connectivityProvider.currentConnectivityType)
     return nil
   }
 
-  private func pathUpdateHandler(path: NWPath) {
-    eventSink?(statusFromPath(path: path))
+  private func connectivityUpdateHandler(connectivityType: ConnectivityType) {
+    eventSink?(statusFrom(connectivityType: connectivityType))
   }
 
   public func onCancel(withArguments _: Any?) -> FlutterError? {
-    pathMonitor.cancel()
+    connectivityProvider.stop()
     eventSink = nil
     return nil
   }

packages/connectivity_plus/connectivity_plus_macos/macos/Classes/ConnectivityProvider.swift

@@ -0,0 +1,20 @@
+import Foundation
+
+public enum ConnectivityType {
+  case none
+  case wiredEthernet
+  case wifi
+  case cellular
+}
+
+public protocol ConnectivityProvider: NSObjectProtocol {
+  typealias ConnectivityUpdateHandler = (ConnectivityType) -> Void
+
+  var currentConnectivityType: ConnectivityType { get }
+
+  var connectivityUpdateHandler: ConnectivityUpdateHandler? { get set }
+
+  func start()
+
+  func stop()
+}

packages/connectivity_plus/connectivity_plus_macos/macos/Classes/PathMonitorConnectivityProvider.swift

@@ -0,0 +1,40 @@
+import Foundation
+import Network
+
+@available(macOS 10.14, *)
+public class PathMonitorConnectivityProvider: NSObject, ConnectivityProvider {
+  private let pathMonitor = NWPathMonitor()
+
+  public var currentConnectivityType: ConnectivityType {
+    let path = pathMonitor.currentPath
+    if path.status == .satisfied {
+      if path.usesInterfaceType(.wifi) {
+        return .wifi
+      } else if path.usesInterfaceType(.cellular) {
+        return .cellular
+      } else if path.usesInterfaceType(.wiredEthernet) {
+        return .wiredEthernet
+      }
+    }
+    return .none
+  }
+
+  public var connectivityUpdateHandler: ConnectivityUpdateHandler?
+
+  override init() {
+    super.init()
+    pathMonitor.pathUpdateHandler = pathUpdateHandler
+  }
+
+  public func start() {
+    pathMonitor.start(queue: .main)
+  }
+
+  public func stop() {
+    pathMonitor.cancel()
+  }
+
+  private func pathUpdateHandler(path: NWPath) {
+    connectivityUpdateHandler?(currentConnectivityType)
+  }
+}

packages/connectivity_plus/connectivity_plus_macos/macos/Classes/ReachabilityConnectivityProvider.swift

@@ -0,0 +1,46 @@
+import Foundation
+import Reachability
+
+public class ReachabilityConnectivityProvider: NSObject, ConnectivityProvider {
+  private var reachability: Reachability?
+
+  public var currentConnectivityType: ConnectivityType {
+    let reachability = try? self.reachability ?? Reachability()
+    switch reachability?.connection ?? .unavailable {
+    case .wifi:
+      return .wifi
+    case .cellular:
+      return .cellular
+    default:
+      return .none
+    }
+  }
+
+  public var connectivityUpdateHandler: ConnectivityUpdateHandler?
+
+  public func start() {
+    reachability = try? Reachability()
+
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(reachabilityChanged),
+      name: .reachabilityChanged,
+      object: reachability)
+
+    try? reachability?.startNotifier()
+  }
+
+  public func stop() {
+    NotificationCenter.default.removeObserver(
+      self,
+      name: .reachabilityChanged,
+      object: reachability)
+
+    reachability?.stopNotifier()
+    reachability = nil
+  }
+
+  @objc private func reachabilityChanged(notification: NSNotification) {
+    connectivityUpdateHandler?(currentConnectivityType)
+  }
+}

packages/connectivity_plus/connectivity_plus_macos/macos/connectivity_plus_macos.podspec

@@ -15,7 +15,8 @@ Pod::Spec.new do |s|
   s.documentation_url = 'https://pub.dev/packages/connectivity_plus'
   s.source_files     = 'Classes/**/*'
   s.dependency 'FlutterMacOS'
+  s.dependency 'ReachabilitySwift'
 
   s.platform = :osx
-  s.osx.deployment_target = '10.14'
-end
+  s.osx.deployment_target = '10.11'
+end

packages/connectivity_plus/connectivity_plus_macos/pubspec.yaml

@@ -1,6 +1,6 @@
 name: connectivity_plus_macos
 description: macOS implementation of the connectivity_plus plugin.
-version: 1.1.0
+version: 1.2.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/