From 8f16bf376d40e52e14cf02c8728bce77fc8b01d2 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Fri, 4 Feb 2022 14:17:55 +0100
Subject: [PATCH] Attempt beta release

Fix naive compile issue.
---
 .beta-build                                                 | 2 +-
 Passepartout.xcodeproj/project.pbxproj                      | 4 ++--
 Passepartout/App/iOS/Info.plist                             | 2 +-
 .../App/iOS/Scenes/NetworkSettingsViewController.swift      | 6 +-----
 Passepartout/App/macOS/Info.plist                           | 2 +-
 Passepartout/App/macOS/Launcher/Info.plist                  | 2 +-
 Passepartout/Tunnel/Info.plist                              | 2 +-
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.beta-build b/.beta-build
index bf2403c4..9870e4a2 100644
--- a/.beta-build
+++ b/.beta-build
@@ -1 +1 @@
-2983
+2984
diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj
index eb0a4daa..c4156423 100644
--- a/Passepartout.xcodeproj/project.pbxproj
+++ b/Passepartout.xcodeproj/project.pbxproj
@@ -1426,7 +1426,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2983;
+				CURRENT_PROJECT_VERSION = 2984;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1492,7 +1492,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2983;
+				CURRENT_PROJECT_VERSION = 2984;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
diff --git a/Passepartout/App/iOS/Info.plist b/Passepartout/App/iOS/Info.plist
index 1d5a9c32..71b8d2cf 100644
--- a/Passepartout/App/iOS/Info.plist
+++ b/Passepartout/App/iOS/Info.plist
@@ -35,7 +35,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2983</string>
+	<string>2984</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift b/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift
index 15c89c1a..766f719d 100644
--- a/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift
+++ b/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift
@@ -282,11 +282,7 @@ class NetworkSettingsViewController: UITableViewController {
         } else if field.tag == FieldTag.proxyPort.rawValue {
             networkSettings.proxyPort = UInt16(text) ?? 0
         } else if field.tag == FieldTag.proxyAutoConfigurationURL.rawValue {
-            if let string = text {
-                networkSettings.proxyAutoConfigurationURL = URL(string: string)
-            } else {
-                networkSettings.proxyAutoConfigurationURL = nil
-            }
+            networkSettings.proxyAutoConfigurationURL = URL(string: text)
         } else if field.tag >= FieldTag.proxyBypass.rawValue {
             let i = field.tag - FieldTag.proxyBypass.rawValue
             if let _ = networkSettings.proxyBypassDomains {
diff --git a/Passepartout/App/macOS/Info.plist b/Passepartout/App/macOS/Info.plist
index e6f0aa74..24c4a719 100644
--- a/Passepartout/App/macOS/Info.plist
+++ b/Passepartout/App/macOS/Info.plist
@@ -34,7 +34,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2983</string>
+	<string>2984</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Passepartout/App/macOS/Launcher/Info.plist b/Passepartout/App/macOS/Launcher/Info.plist
index 9d02f8b3..9bbcdaef 100644
--- a/Passepartout/App/macOS/Launcher/Info.plist
+++ b/Passepartout/App/macOS/Launcher/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2983</string>
+	<string>2984</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Passepartout/Tunnel/Info.plist b/Passepartout/Tunnel/Info.plist
index 49ac333e..2cca48ad 100644
--- a/Passepartout/Tunnel/Info.plist
+++ b/Passepartout/Tunnel/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2983</string>
+	<string>2984</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>