|
|
@@ -101,7 +101,7 @@ public class Reachability {
|
|
|
}()
|
|
|
|
|
|
fileprivate var notifierRunning = false
|
|
|
- fileprivate var reachabilityRef: SCNetworkReachability?
|
|
|
+ fileprivate let reachabilityRef: SCNetworkReachability
|
|
|
|
|
|
fileprivate let reachabilitySerialQueue = DispatchQueue(label: "uk.co.ashleymills.reachability")
|
|
|
|
|
|
@@ -132,10 +132,6 @@ public class Reachability {
|
|
|
|
|
|
deinit {
|
|
|
stopNotifier()
|
|
|
-
|
|
|
- reachabilityRef = nil
|
|
|
- whenReachable = nil
|
|
|
- whenUnreachable = nil
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -144,7 +140,7 @@ public extension Reachability {
|
|
|
// MARK: - *** Notifier methods ***
|
|
|
func startNotifier() throws {
|
|
|
|
|
|
- guard let reachabilityRef = reachabilityRef, !notifierRunning else { return }
|
|
|
+ guard !notifierRunning else { return }
|
|
|
|
|
|
var context = SCNetworkReachabilityContext(version: 0, info: nil, retain: nil, release: nil, copyDescription: nil)
|
|
|
context.info = UnsafeMutableRawPointer(Unmanaged<Reachability>.passUnretained(self).toOpaque())
|
|
|
@@ -168,7 +164,6 @@ public extension Reachability {
|
|
|
|
|
|
func stopNotifier() {
|
|
|
defer { notifierRunning = false }
|
|
|
- guard let reachabilityRef = reachabilityRef else { return }
|
|
|
|
|
|
SCNetworkReachabilitySetCallback(reachabilityRef, nil, nil)
|
|
|
SCNetworkReachabilitySetDispatchQueue(reachabilityRef, nil)
|
|
|
@@ -281,9 +276,6 @@ fileprivate extension Reachability {
|
|
|
}
|
|
|
|
|
|
var reachabilityFlags: SCNetworkReachabilityFlags {
|
|
|
-
|
|
|
- guard let reachabilityRef = reachabilityRef else { return SCNetworkReachabilityFlags() }
|
|
|
-
|
|
|
var flags = SCNetworkReachabilityFlags()
|
|
|
let gotFlags = withUnsafeMutablePointer(to: &flags) {
|
|
|
SCNetworkReachabilityGetFlags(reachabilityRef, UnsafeMutablePointer($0))
|