passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QR Code: Error out on duplicate name 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-11-01 01:36:28 +05:30
parent 050f8aa679
commit bede8a17ad
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WireGuard/WireGuard/UI/iOS/QRScanViewController.swift
View File

@ -6,7 +6,7 @@ import CoreData
import UIKit
protocol QRScanViewControllerDelegate: class {
func scannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController)
func addScannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController, completionHandler: (() ->Void)?)
}
class QRScanViewController: UIViewController {
@ -119,8 +119,9 @@ class QRScanViewController: UIViewController {
if (title.isEmpty) { return }
tunnelConfiguration.interface.name = title
if let s = self {
s.delegate?.scannedQRCode(tunnelConfiguration: tunnelConfiguration, qrScanViewController: s)
s.dismiss(animated: true, completion: nil)
s.delegate?.addScannedQRCode(tunnelConfiguration: tunnelConfiguration, qrScanViewController: s) {
s.dismiss(animated: true, completion: nil)
}
}
}))
present(alert, animated: true)

10
WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
View File

@ -214,11 +214,13 @@ extension TunnelsListTableViewController: UIDocumentPickerDelegate {
// MARK: QRScanViewControllerDelegate
extension TunnelsListTableViewController: QRScanViewControllerDelegate {
func scannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController) {
tunnelsManager?.add(tunnelConfiguration: tunnelConfiguration) { [weak self] (tunnel, error) in
func addScannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController,
completionHandler: (() ->Void)?) {
tunnelsManager?.add(tunnelConfiguration: tunnelConfiguration) { (tunnel, error) in
if let error = error {
print("Could not add tunnel: \(error)")
self?.showErrorAlert(title: "Could not save scanned config", message: "Internal error")
ErrorPresenter.showErrorAlert(error: error, from: qrScanViewController, onDismissal: completionHandler)
} else {
completionHandler?()
}
}
}