Merge pull request #4 from SwiftRex/fixInitialState

Fix initial state
SwiftRex · May 17, 2021 · 98233b4 · 98233b4
2 parents 2ef748a + b1bd499
commit 98233b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Sources/ReachabilityMiddleware/ReachabilityMiddleware.swift b/Sources/ReachabilityMiddleware/ReachabilityMiddleware.swift
@@ -35,7 +35,7 @@ where InputActionType == ReachabilityEvent,
 
                                 send(event: .gotOffline,
                                      when: ![.wiredEthernet, .wifi, .cellular].contains(where: path.usesInterfaceType),
-                                     previously: \.connectivity != .none,
+                                     previously: \.connectivity != .offline,
                                      state: state),
 
                                 send(event: .becameExpensive,

diff --git a/Sources/ReachabilityMiddleware/ReachabilityReducer.swift b/Sources/ReachabilityMiddleware/ReachabilityReducer.swift
@@ -28,7 +28,7 @@ extension Reducer where ActionType == ReachabilityEvent, StateType == Reachabili
         case .gotOffline:
             state = .init(
                 isMonitoring: state.isMonitoring,
-                connectivity: .none,
+                connectivity: .offline,
                 isExpensive: state.isExpensive,
                 isConstrained: state.isConstrained
             )

diff --git a/Sources/ReachabilityMiddleware/ReachabilityState.swift b/Sources/ReachabilityMiddleware/ReachabilityState.swift
@@ -15,20 +15,22 @@ extension ReachabilityState {
     public static var initial: ReachabilityState {
         .init(
             isMonitoring: false,
-            connectivity: .none,
+            connectivity: .unknown,
             isExpensive: true,
             isConstrained: true
         )
     }
 }
 
 public enum ConnectedInterface: String, Codable, Hashable {
+    /// Initial state, we don't know yet the state of the interface
+    case unknown
     /// cellular (3G, LTE, 5G networks)
     case cellular
     /// Wi-fi, including Personal Hotpots
     case wifi
     /// Wired Ethernet
     case wired
     /// Disconnected
-    case none
+    case offline
 }