ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "TunnelsManager: initialize observer on correct thread"

Browse Source 
Rather, we'll make sure we always call startObservingTunnelStatus from
the main thread.

This reverts commit d16a6a167c8217e81dd9111d1ad9e4ec6429ef3b.

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2018-11-03 18:45:26 +05:30
parent 66389c60b5
commit 538704e7bd
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/VPN/TunnelsManager.swift
+5 -7
View File
@@ -399,14 +399,13 @@ class TunnelContainer: NSObject {
} }
private func startObservingTunnelStatus() { private func startObservingTunnelStatus() {
DispatchQueue.main.async { [weak self] in if (statusObservationToken != nil) { return }
guard let s = self else { return } let connection = tunnelProvider.connection
if (s.statusObservationToken != nil) { return } statusObservationToken = NotificationCenter.default.addObserver(
let connection = s.tunnelProvider.connection
s.statusObservationToken = NotificationCenter.default.addObserver(
forName: .NEVPNStatusDidChange, forName: .NEVPNStatusDidChange,
object: connection, object: connection,
queue: nil) { (_) in queue: nil) { [weak self] (_) in
guard let s = self else { return }
if ((s.status == .restarting) && (connection.status == .disconnected || connection.status == .disconnecting)) { if ((s.status == .restarting) && (connection.status == .disconnected || connection.status == .disconnecting)) {
// Don't change s.status when disconnecting for a restart // Don't change s.status when disconnecting for a restart
if (connection.status == .disconnected) { if (connection.status == .disconnected) {
@@ -424,7 +423,6 @@ class TunnelContainer: NSObject {
} }
} }
} }
}
private func stopObservingTunnelStatus() { private func stopObservingTunnelStatus() {
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in