From 0706d552bede8b937e824f6a9a25e26ed1c23c38 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Tue, 30 Oct 2018 00:25:45 +0100 Subject: [PATCH] Drop redundant disconnection alert on Wi-Fi add Doesn't trust by default, so it won't disconnect. See 474105d --- .../Sources/Model/TrustedNetworks.swift | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/Passepartout/Sources/Model/TrustedNetworks.swift b/Passepartout/Sources/Model/TrustedNetworks.swift index b9946bfe..6820ed73 100644 --- a/Passepartout/Sources/Model/TrustedNetworks.swift +++ b/Passepartout/Sources/Model/TrustedNetworks.swift @@ -131,26 +131,19 @@ class TrustedNetworksModel { let isTrusted = false let rowIndex = rowIndexForWifi(at: index) - let completionHandler: () -> Void = { - self.trustedWifis[wifiToAdd] = isTrusted + trustedWifis[wifiToAdd] = isTrusted - if !isDuplicate { - self.sortedWifis.insert(wifiToAdd, at: index) - #if os(iOS) - self.rows.insert(.trustedWiFi, at: rowIndex) - #endif - self.delegate?.trustedNetworks(self, shouldInsertWifiAt: rowIndex) - } else { - self.delegate?.trustedNetworks(self, shouldReloadWifiAt: rowIndex, isTrusted: isTrusted) - } + if !isDuplicate { + sortedWifis.insert(wifiToAdd, at: index) + #if os(iOS) + rows.insert(.trustedWiFi, at: rowIndex) + #endif + delegate?.trustedNetworks(self, shouldInsertWifiAt: rowIndex) + } else { + delegate?.trustedNetworks(self, shouldReloadWifiAt: rowIndex, isTrusted: isTrusted) + } - self.delegate?.trustedNetworksShouldReinstall(self) - } - guard !mightDisconnect() else { - delegate?.trustedNetworksShouldConfirmDisconnection(self, triggeredAt: rowIndex, completionHandler: completionHandler) - return - } - completionHandler() + delegate?.trustedNetworksShouldReinstall(self) } func removeWifi(at rowIndex: Int) {