From 981a745bcc4eed8c9aa74986e78efa2ade2c152a Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sun, 28 Oct 2018 22:57:58 +0530 Subject: QR code: Minor refactoring Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/UI/iOS/QRScanViewController.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WireGuard/WireGuard/UI/iOS/QRScanViewController.swift b/WireGuard/WireGuard/UI/iOS/QRScanViewController.swift index 6018597..5ae8d08 100644 --- a/WireGuard/WireGuard/UI/iOS/QRScanViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/QRScanViewController.swift @@ -96,13 +96,13 @@ class QRScanViewController: UIViewController { } func scanDidComplete(withCode code: String) { - do { - let tunnelConfiguration = try WgQuickConfigFileParser.parse(code, name: "Scanned") - delegate?.scannedQRCode(tunnelConfiguration: tunnelConfiguration, qrScanViewController: self) - dismiss(animated: true, completion: nil) - } catch { + let scannedTunnelConfiguration = try? WgQuickConfigFileParser.parse(code, name: "Scanned") + guard let tunnelConfiguration = scannedTunnelConfiguration else { scanDidEncounterError(title: "Invalid Code", message: "The scanned code is not a valid WireGuard config file.") + return } + delegate?.scannedQRCode(tunnelConfiguration: tunnelConfiguration, qrScanViewController: self) + dismiss(animated: true, completion: nil) } func scanDidEncounterError(title: String, message: String) { -- cgit v1.2.3-59-g8ed1b