Skip to content

Commit f995896

Browse files
committed
Revert "Separate logic for starting network monitor"
This reverts commit e60953e.
1 parent e60953e commit f995896

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

WooCommerce/Classes/Tools/Connectivity/ConnectivityObserver.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ import Foundation
33
/// Interface for the observing connectivity
44
///
55
protocol ConnectivityObserver {
6-
/// Starts the connectivity observer.
7-
func startObserving()
8-
9-
/// Updates callback block for when connectivity changes.
10-
func updateListener(_ listener: @escaping (ConnectivityStatus) -> Void)
6+
/// Starts the observer with a listener.
7+
func startObserving(listener: @escaping (ConnectivityStatus) -> Void)
118

129
/// Stops the observer.
1310
func stopObserving()

WooCommerce/Classes/Tools/Connectivity/DefaultConnectivityObserver.swift

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,15 @@ final class DefaultConnectivityObserver: ConnectivityObserver {
1212
self.networkMonitor = networkMonitor
1313
}
1414

15-
func startObserving() {
16-
networkMonitor.start(queue: observingQueue)
17-
}
18-
19-
func updateListener(_ listener: @escaping (ConnectivityStatus) -> Void) {
20-
if networkMonitor.pathUpdateHandler == nil {
21-
startObserving()
22-
}
15+
func startObserving(listener: @escaping (ConnectivityStatus) -> Void) {
2316
networkMonitor.pathUpdateHandler = { [weak self] path in
2417
guard let self = self else { return }
2518
let connectivityStatus = self.connectivityStatus(from: path)
2619
DispatchQueue.main.async {
2720
listener(connectivityStatus)
2821
}
2922
}
23+
networkMonitor.start(queue: observingQueue)
3024
}
3125

3226
func stopObserving() {

0 commit comments

Comments
 (0)