From 3376334007fe5ea249c325309405f62eaf094b8b Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 21 Nov 2023 14:17:30 +0100
Subject: [PATCH 01/20] feat: evaluate key rotation as soon as VPN is connected

---
 .../PacketTunnelProvider.swift                    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/wireguard-tunnel-provider/PacketTunnelProvider.swift b/wireguard-tunnel-provider/PacketTunnelProvider.swift
index 3e62a9c05..fe980f016 100644
--- a/wireguard-tunnel-provider/PacketTunnelProvider.swift
+++ b/wireguard-tunnel-provider/PacketTunnelProvider.swift
@@ -145,18 +145,23 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
     }
     
     private func startKeyRegenerationMonitor(completion: @escaping (Error?) -> Void) {
+        evaluateKeyRotation(completion)
         let timer = TimerManager(timeInterval: AppKeyManager.regenerationCheckInterval)
         timer.eventHandler = {
-            if AppKeyManager.needToRegenerate() {
-                self.regenerateKeys { error in
-                    completion(error)
-                }
-            }
+            self.evaluateKeyRotation(completion)
             timer.proceed()
         }
         timer.resume()
     }
     
+    private func evaluateKeyRotation(_ completion: @escaping (Error?) -> Void) {
+        if AppKeyManager.needToRegenerate() {
+            self.regenerateKeys { error in
+                completion(error)
+            }
+        }
+    }
+    
     private func regenerateKeys(completion: @escaping (Error?) -> Void) {
         wg_log(.info, message: "Rotating keys")
         AppKeyManager.shared.setNewKey { privateKey, ipAddress, presharedKey in

From 55c079a9d30625fc47e4a38fa4e478848e3707d3 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 21 Nov 2023 15:15:32 +0100
Subject: [PATCH 02/20] feat(network protection): update Main.storyboard

---
 IVPNClient/Scenes/Base.lproj/Main.storyboard  | 78 +++++++++++++++----
 ...NetworkProtectionRulesViewController.swift |  9 +++
 .../NetworkProtectionViewController.swift     |  2 +-
 3 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/IVPNClient/Scenes/Base.lproj/Main.storyboard b/IVPNClient/Scenes/Base.lproj/Main.storyboard
index c756fac63..6882a8850 100644
--- a/IVPNClient/Scenes/Base.lproj/Main.storyboard
+++ b/IVPNClient/Scenes/Base.lproj/Main.storyboard
@@ -1048,7 +1048,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="383.5" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rules" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lt3-b8-90e">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Actions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lt3-b8-90e">
                                             <rect key="frame" x="16" y="0.0" width="367.5" height="44"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="44" id="ezS-Cq-ebd"/>
@@ -1155,7 +1155,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disable LAN traffic" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Px-e7-mel">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Block LAN traffic" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Px-e7-mel">
                                                     <rect key="frame" x="16" y="11.5" width="325" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="Dng-9i-R8W"/>
@@ -1833,7 +1833,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <sections>
-                            <tableViewSection headerTitle="Untrusted networks" footerTitle="Perform actions when joining untrusted networks." id="S8T-hy-GVA">
+                            <tableViewSection headerTitle="Actions for Untrusted networks" id="S8T-hy-GVA">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="Hec-2a-mmX">
                                         <rect key="frame" x="0.0" y="55.5" width="414" height="43.5"/>
@@ -1842,7 +1842,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connect to IVPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfd-Ka-Emc">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connect to VPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfd-Ka-Emc">
                                                     <rect key="frame" x="16" y="11.5" width="325" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="iKn-Ji-1En"/>
@@ -1868,18 +1868,61 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="UjJ-0X-ZaB">
+                                        <rect key="frame" x="0.0" y="99" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="UjJ-0X-ZaB" id="VZn-FP-xjN">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Block LAN traffic" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwa-6R-JaK">
+                                                    <rect key="frame" x="16" y="11.5" width="325" height="21"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="21" id="Msh-Nw-DEx"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" name="ivpnLabelPrimary"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="YdE-0I-FaY">
+                                                    <rect key="frame" x="349" y="6.5" width="51" height="31"/>
+                                                    <color key="onTintColor" name="ivpnBlue"/>
+                                                    <connections>
+                                                        <action selector="toggleUntrustedBlockLan:" destination="KeU-1p-EOn" eventType="valueChanged" id="7t6-A1-5Xv"/>
+                                                    </connections>
+                                                </switch>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k0a-dC-O1Z">
+                                                    <rect key="frame" x="294" y="5" width="50" height="34"/>
+                                                    <color key="tintColor" name="ivpnBlue"/>
+                                                    <buttonConfiguration key="configuration" style="plain"/>
+                                                    <connections>
+                                                        <action selector="blockLanInfo:" destination="KeU-1p-EOn" eventType="touchUpInside" id="Oo2-yu-3xw"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="dwa-6R-JaK" firstAttribute="leading" secondItem="VZn-FP-xjN" secondAttribute="leading" constant="16" id="1Q2-cY-mc7"/>
+                                                <constraint firstItem="dwa-6R-JaK" firstAttribute="centerY" secondItem="VZn-FP-xjN" secondAttribute="centerY" id="KcH-D3-s5s"/>
+                                                <constraint firstItem="YdE-0I-FaY" firstAttribute="leading" secondItem="dwa-6R-JaK" secondAttribute="trailing" constant="8" id="NrD-EX-zLA"/>
+                                                <constraint firstItem="YdE-0I-FaY" firstAttribute="leading" secondItem="k0a-dC-O1Z" secondAttribute="trailing" constant="5" id="Zuo-XK-eEJ"/>
+                                                <constraint firstAttribute="trailing" secondItem="YdE-0I-FaY" secondAttribute="trailing" constant="16" id="aB8-0l-vQB"/>
+                                                <constraint firstItem="YdE-0I-FaY" firstAttribute="centerY" secondItem="VZn-FP-xjN" secondAttribute="centerY" id="aMS-v1-nHg"/>
+                                                <constraint firstItem="k0a-dC-O1Z" firstAttribute="centerY" secondItem="VZn-FP-xjN" secondAttribute="centerY" id="jvg-Fc-8vY"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
-                            <tableViewSection headerTitle="Trusted networks" footerTitle="Perform actions when joining trusted networks." id="JAX-Ux-qWp">
+                            <tableViewSection headerTitle="Actions for Trusted networks" id="JAX-Ux-qWp">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="LQB-U7-lx2">
-                                        <rect key="frame" x="0.0" y="174.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="198.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LQB-U7-lx2" id="L9P-xT-v3S">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disconnect from IVPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ANI-r0-Szb">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Disconnect from VPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ANI-r0-Szb">
                                                     <rect key="frame" x="16" y="11.5" width="325" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="ltt-w0-4tK"/>
@@ -1913,9 +1956,10 @@
                             <outlet property="delegate" destination="KeU-1p-EOn" id="0l4-Ve-69S"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="Rules" id="Ksh-Tk-ybx"/>
+                    <navigationItem key="navigationItem" title="Actions" id="Ksh-Tk-ybx"/>
                     <connections>
                         <outlet property="trustedDisconnectSwitch" destination="KtM-VU-Ndh" id="ojw-XK-anV"/>
+                        <outlet property="untrustedBlockLanSwitch" destination="YdE-0I-FaY" id="T2c-tm-zlS"/>
                         <outlet property="untrustedConnectSwitch" destination="9TS-ou-G9P" id="SJV-JP-pMb"/>
                     </connections>
                 </tableViewController>
@@ -1933,14 +1977,14 @@
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ProtocolTableViewCell" id="HtI-Zu-PMl" customClass="ProtocolTableViewCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="55.5" width="414" height="43.5"/>
+                                <rect key="frame" x="0.0" y="55.5" width="414" height="43"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="HtI-Zu-PMl" id="xBM-uI-V8V">
-                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="weu-7I-qbg">
-                                            <rect key="frame" x="16" y="14" width="361.5" height="16"/>
+                                            <rect key="frame" x="16" y="13.5" width="361.5" height="16"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="16" id="K4t-rv-8Rj"/>
                                             </constraints>
@@ -1949,7 +1993,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protocol Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WQ9-eM-bEA">
-                                            <rect key="frame" x="16" y="11" width="359.5" height="21.5"/>
+                                            <rect key="frame" x="16" y="11" width="359.5" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" name="ivpnLabelPrimary"/>
                                             <nil key="highlightedColor"/>
@@ -1971,7 +2015,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WireGuardRegenerationRateCell" rowHeight="60" id="JLp-oZ-cVy" customClass="WireGuardRegenerationRateCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="99" width="414" height="60"/>
+                                <rect key="frame" x="0.0" y="98.5" width="414" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JLp-oZ-cVy" id="Y7T-PJ-VmA">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="60"/>
@@ -3008,13 +3052,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="QWM-1S-ZSK">
                                                             <rect key="frame" x="0.0" y="0.0" width="79" height="34.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wi-Fi network" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EZ-JE-Wek">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Wi-Fi network" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EZ-JE-Wek">
                                                                     <rect key="frame" x="0.0" y="0.0" width="79" height="14.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULG-XZ-rT5">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULG-XZ-rT5">
                                                                     <rect key="frame" x="0.0" y="17.5" width="79" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
@@ -3068,13 +3112,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="E3R-Ez-ZjT">
                                                             <rect key="frame" x="0.0" y="0.0" width="338.5" height="34.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Protocol, Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rBm-y5-gNO">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protocol, Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rBm-y5-gNO">
                                                                     <rect key="frame" x="0.0" y="0.0" width="338.5" height="14.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfE-oo-iTV">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfE-oo-iTV">
                                                                     <rect key="frame" x="0.0" y="17.5" width="338.5" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
index 0a7cee34a..24d1bb114 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
@@ -26,6 +26,7 @@ import UIKit
 class NetworkProtectionRulesViewController: UITableViewController {
     
     @IBOutlet weak var untrustedConnectSwitch: UISwitch!
+    @IBOutlet weak var untrustedBlockLanSwitch: UISwitch!
     @IBOutlet weak var trustedDisconnectSwitch: UISwitch!
     let defaults = UserDefaults.shared
     
@@ -38,6 +39,14 @@ class NetworkProtectionRulesViewController: UITableViewController {
         }
     }
     
+    @IBAction func toggleUntrustedBlockLan(_ sender: UISwitch) {
+        
+    }
+    
+    @IBAction func blockLanInfo(_ sender: UIButton) {
+        showAlert(title: "", message: "When enabled, it overrides the 'Block LAN traffic' option in Advanced Settings.")
+    }
+    
     @IBAction func toggleTrustedDisconnect(_ sender: UISwitch) {
         defaults.set(sender.isOn, forKey: UserDefaults.Key.networkProtectionTrustedDisconnect)
         Application.shared.connectionManager.evaluateConnection { [self] error in
diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionViewController.swift
index e73ee3ac0..ffc0dfa80 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionViewController.swift
@@ -158,7 +158,7 @@ extension NetworkProtectionViewController {
     override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
         switch section {
         case 0:
-            return "On iOS 13 and above, current Wi-Fi name is available only when IVPN profile is saved in iOS VPN Configurations."
+            return "Current Wi-Fi name is available only when IVPN profile is saved in iOS VPN Configurations."
         default:
             return nil
         }

From 285fb6893667e6b6e343e27739c66aa46bf701cc Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 21 Nov 2023 15:21:51 +0100
Subject: [PATCH 03/20] feat(network protection): update UserDefaults+Ext.swift

---
 .../NetworkProtectionRulesViewController.swift            | 8 +++++++-
 IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift    | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
index 24d1bb114..3b4123997 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
@@ -40,7 +40,12 @@ class NetworkProtectionRulesViewController: UITableViewController {
     }
     
     @IBAction func toggleUntrustedBlockLan(_ sender: UISwitch) {
-        
+        defaults.set(sender.isOn, forKey: UserDefaults.Key.networkProtectionUntrustedBlockLan)
+        Application.shared.connectionManager.evaluateConnection { [self] error in
+            if error != nil {
+                showWireGuardKeysMissingError()
+            }
+        }
     }
     
     @IBAction func blockLanInfo(_ sender: UIButton) {
@@ -60,6 +65,7 @@ class NetworkProtectionRulesViewController: UITableViewController {
         super.viewDidLoad()
         tableView.backgroundColor = UIColor.init(named: Theme.ivpnBackgroundQuaternary)
         untrustedConnectSwitch.setOn(defaults.networkProtectionUntrustedConnect, animated: false)
+        untrustedBlockLanSwitch.setOn(defaults.networkProtectionUntrustedBlockLan, animated: false)
         trustedDisconnectSwitch.setOn(defaults.networkProtectionTrustedDisconnect, animated: false)
     }
     
diff --git a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
index 85a05ac83..f4bd145ca 100644
--- a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
@@ -39,6 +39,7 @@ extension UserDefaults {
         static let isLogging = "isLogging"
         static let networkProtectionEnabled = "networkProtection.enabled"
         static let networkProtectionUntrustedConnect = "networkProtection.untrusted.connect"
+        static let networkProtectionUntrustedBlockLan = "networkProtection.untrusted.blockLan"
         static let networkProtectionTrustedDisconnect = "networkProtection.trusted.disconnect"
         static let isCustomDNS = "isCustomDNS"
         static let customDNSProtocol = "customDNSProtocol"
@@ -123,6 +124,10 @@ extension UserDefaults {
         return bool(forKey: Key.networkProtectionUntrustedConnect)
     }
     
+    @objc dynamic var networkProtectionUntrustedBlockLan: Bool {
+        return bool(forKey: Key.networkProtectionUntrustedBlockLan)
+    }
+    
     @objc dynamic var networkProtectionTrustedDisconnect: Bool {
         return bool(forKey: Key.networkProtectionTrustedDisconnect)
     }
@@ -268,6 +273,7 @@ extension UserDefaults {
         shared.removeObject(forKey: Key.isLogging)
         shared.removeObject(forKey: Key.networkProtectionEnabled)
         shared.removeObject(forKey: Key.networkProtectionUntrustedConnect)
+        shared.removeObject(forKey: Key.networkProtectionUntrustedBlockLan)
         shared.removeObject(forKey: Key.networkProtectionTrustedDisconnect)
         shared.removeObject(forKey: Key.isCustomDNS)
         shared.removeObject(forKey: Key.customDNS)

From 98dcab0cdfc42c3d9502903791668ace81e2be92 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 21 Nov 2023 15:33:30 +0100
Subject: [PATCH 04/20] refactor(ui): update quantum alert in
 WireGuardSettingsViewController

---
 IVPNClient/Scenes/Base.lproj/Main.storyboard  | 90 +++----------------
 ...NetworkProtectionRulesViewController.swift |  2 +-
 .../WireGuardSettingsViewController.swift     |  4 +
 3 files changed, 19 insertions(+), 77 deletions(-)

diff --git a/IVPNClient/Scenes/Base.lproj/Main.storyboard b/IVPNClient/Scenes/Base.lproj/Main.storyboard
index 6882a8850..6ecdb1fd3 100644
--- a/IVPNClient/Scenes/Base.lproj/Main.storyboard
+++ b/IVPNClient/Scenes/Base.lproj/Main.storyboard
@@ -2306,15 +2306,15 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" id="A7k-S9-BKV">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="A7k-S9-BKV">
                                         <rect key="frame" x="0.0" y="355.5" width="414" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="A7k-S9-BKV" id="E0q-JA-op2">
-                                            <rect key="frame" x="0.0" y="0.0" width="383.5" height="60"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enabled" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HK8-HG-901">
-                                                    <rect key="frame" x="16" y="34" width="351.5" height="16"/>
+                                                    <rect key="frame" x="16" y="34" width="382" height="16"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="16" id="UeF-Il-FKW"/>
                                                     </constraints>
@@ -2323,7 +2323,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Quantum Resistance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ujb-H4-dvc">
-                                                    <rect key="frame" x="16" y="10" width="351.5" height="21"/>
+                                                    <rect key="frame" x="16" y="10" width="382" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="EI6-Z6-Asz"/>
                                                     </constraints>
@@ -2331,20 +2331,27 @@
                                                     <color key="textColor" name="ivpnLabelPrimary"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CBJ-vO-JKH">
+                                                    <rect key="frame" x="356" y="13" width="50" height="34"/>
+                                                    <color key="tintColor" name="ivpnBlue"/>
+                                                    <buttonConfiguration key="configuration" style="plain"/>
+                                                    <connections>
+                                                        <action selector="quantumInfo:" destination="BYK-jY-KqR" eventType="touchUpInside" id="yDp-xR-jN3"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                             <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="CBJ-vO-JKH" secondAttribute="trailing" constant="8" id="Jwf-sE-1sw"/>
                                                 <constraint firstAttribute="trailing" secondItem="Ujb-H4-dvc" secondAttribute="trailing" constant="16" id="OdS-RE-rwx"/>
                                                 <constraint firstItem="HK8-HG-901" firstAttribute="leading" secondItem="E0q-JA-op2" secondAttribute="leading" constant="16" id="Z9F-cP-U8K"/>
                                                 <constraint firstAttribute="trailing" secondItem="HK8-HG-901" secondAttribute="trailing" constant="16" id="fCl-yy-Ryh"/>
                                                 <constraint firstItem="Ujb-H4-dvc" firstAttribute="leading" secondItem="E0q-JA-op2" secondAttribute="leading" constant="16" id="gdb-qA-2fP"/>
+                                                <constraint firstItem="CBJ-vO-JKH" firstAttribute="centerY" secondItem="E0q-JA-op2" secondAttribute="centerY" id="gln-BV-d7F"/>
                                                 <constraint firstItem="HK8-HG-901" firstAttribute="top" secondItem="Ujb-H4-dvc" secondAttribute="bottom" constant="3" id="uZo-78-dUo"/>
                                                 <constraint firstItem="Ujb-H4-dvc" firstAttribute="top" secondItem="E0q-JA-op2" secondAttribute="top" constant="10" id="x2B-GM-1Qt"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <color key="tintColor" name="ivpnBlue"/>
-                                        <connections>
-                                            <segue destination="ocV-OR-MsS" kind="show" id="PQd-Mv-PiN"/>
-                                        </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="kyR-6G-Jra">
                                         <rect key="frame" x="0.0" y="415.5" width="414" height="60"/>
@@ -4804,55 +4811,6 @@
             </objects>
             <point key="canvasLocation" x="6294" y="12"/>
         </scene>
-        <!--Quantum Resistance-->
-        <scene sceneID="2OJ-Qb-AeN">
-            <objects>
-                <viewController id="jBV-as-muh" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="KWO-yD-5W2"/>
-                        <viewControllerLayoutGuide type="bottom" id="oqe-EB-HzC"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="oVs-Y4-qqM">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mcf-fz-46K">
-                                <rect key="frame" x="20" y="214" width="374" height="107.5"/>
-                                <string key="text">When Enabled, a Pre-shared key has been securely exchanged between your device and the server using post-quantum Key Encapsulation Mechanism (KEM) algorithms. If Disabled, the current VPN connection, while secure under today's standards, does not include this extra layer of quantum resistance.</string>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <color key="textColor" name="ivpnLabelPrimary"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hHL-iy-7GY">
-                                <rect key="frame" x="20" y="117" width="374" height="72"/>
-                                <string key="text">Quantum Resistance: Indicates whether your current WireGuard VPN connection is using additional protection measures against potential future quantum computer attacks.</string>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <color key="textColor" name="ivpnLabelPrimary"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="hHL-iy-7GY" firstAttribute="leading" secondItem="oVs-Y4-qqM" secondAttribute="leadingMargin" id="824-uz-szo"/>
-                            <constraint firstItem="hHL-iy-7GY" firstAttribute="trailing" secondItem="oVs-Y4-qqM" secondAttribute="trailingMargin" id="LYn-JQ-3mr"/>
-                            <constraint firstItem="mcf-fz-46K" firstAttribute="trailing" secondItem="oVs-Y4-qqM" secondAttribute="trailingMargin" id="ahX-9K-FxV"/>
-                            <constraint firstItem="hHL-iy-7GY" firstAttribute="top" secondItem="KWO-yD-5W2" secondAttribute="bottom" constant="25" id="aoE-Y8-gGz"/>
-                            <constraint firstItem="mcf-fz-46K" firstAttribute="leading" secondItem="oVs-Y4-qqM" secondAttribute="leadingMargin" id="cB6-zV-UrB"/>
-                            <constraint firstItem="mcf-fz-46K" firstAttribute="top" secondItem="hHL-iy-7GY" secondAttribute="bottom" constant="25" id="eYe-LJ-J9p"/>
-                        </constraints>
-                    </view>
-                    <navigationItem key="navigationItem" title="Quantum Resistance" largeTitleDisplayMode="never" id="hjh-rq-38P">
-                        <barButtonItem key="rightBarButtonItem" title="Close" style="done" id="b7J-85-FeF">
-                            <connections>
-                                <action selector="dismissViewController:" destination="jBV-as-muh" id="eeQ-G9-PXi"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="nfN-dM-IE6" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="8037.6811594202909" y="12.723214285714285"/>
-        </scene>
         <!--Navigation Controller-->
         <scene sceneID="jBO-kh-cLX">
             <objects>
@@ -4872,26 +4830,6 @@
             </objects>
             <point key="canvasLocation" x="5414" y="13"/>
         </scene>
-        <!--Quantum Resistance-->
-        <scene sceneID="bHb-5a-3sN">
-            <objects>
-                <navigationController title="Quantum Resistance" automaticallyAdjustsScrollViewInsets="NO" modalPresentationStyle="formSheet" id="ocV-OR-MsS" customClass="NavigationController" customModule="IVPNClient" customModuleProvider="target" sceneMemberID="viewController">
-                    <toolbarItems/>
-                    <navigationItem key="navigationItem" id="Ou1-C2-U5d"/>
-                    <value key="contentSizeForViewInPopover" type="size" width="540" height="700"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="98Z-fD-wte">
-                        <rect key="frame" x="0.0" y="48" width="414" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="jBV-as-muh" kind="relationship" relationship="rootViewController" id="5sH-ND-Rbk"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="6Mx-t1-BTV" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="7180" y="13"/>
-        </scene>
         <!--Navigation Controller-->
         <scene sceneID="EPO-MU-jc9">
             <objects>
diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
index 3b4123997..9f7f1d7cf 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
@@ -49,7 +49,7 @@ class NetworkProtectionRulesViewController: UITableViewController {
     }
     
     @IBAction func blockLanInfo(_ sender: UIButton) {
-        showAlert(title: "", message: "When enabled, it overrides the 'Block LAN traffic' option in Advanced Settings.")
+        showAlert(title: "Info", message: "When enabled, it overrides the 'Block LAN traffic' option in Advanced Settings.")
     }
     
     @IBAction func toggleTrustedDisconnect(_ sender: UISwitch) {
diff --git a/IVPNClient/Scenes/ViewControllers/WireGuardSettingsViewController.swift b/IVPNClient/Scenes/ViewControllers/WireGuardSettingsViewController.swift
index b66d6099f..8e12d0bd3 100644
--- a/IVPNClient/Scenes/ViewControllers/WireGuardSettingsViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/WireGuardSettingsViewController.swift
@@ -85,6 +85,10 @@ class WireGuardSettingsViewController: UITableViewController {
         present(viewController, animated: true)
     }
     
+    @IBAction func quantumInfo(_ sender: UIButton) {
+        showAlert(title: "Info", message: "Quantum Resistance: Indicates whether your current WireGuard VPN connection is using additional protection measures against potential future quantum computer attacks.\n\nWhen Enabled, a Pre-shared key has been securely exchanged between your device and the server using post-quantum Key Encapsulation Mechanism (KEM) algorithms. If Disabled, the current VPN connection, while secure under today's standards, does not include this extra layer of quantum resistance.")
+    }
+    
     // MARK: - View Lifecycle -
     
     override func viewDidLoad() {

From 930995460884c4e7b4dfc88acefd86d40fc8e0e2 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 21 Nov 2023 18:27:16 +0100
Subject: [PATCH 05/20] feat(network protection): validate ipsec

---
 .../Scenes/ViewControllers/AdvancedViewController.swift    | 2 +-
 .../NetworkProtectionRulesViewController.swift             | 7 +++++++
 .../Scenes/ViewControllers/ProtocolViewController.swift    | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
index 1699349e9..3f433577a 100644
--- a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
@@ -49,7 +49,7 @@ class AdvancedViewController: UITableViewController {
     
     @IBAction func toggleDisableLanAccess(_ sender: UISwitch) {
         if sender.isOn && Application.shared.settings.connectionProtocol.tunnelType() == .ipsec {
-            showAlert(title: "IKEv2 not supported", message: "Disable LAN traffic is supported only for OpenVPN and WireGuard protocols.") { _ in
+            showAlert(title: "IKEv2 not supported", message: "Block LAN traffic is supported only for OpenVPN and WireGuard protocols.") { _ in
                 sender.setOn(false, animated: true)
             }
             return
diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
index 9f7f1d7cf..61fe0fffd 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
@@ -40,6 +40,13 @@ class NetworkProtectionRulesViewController: UITableViewController {
     }
     
     @IBAction func toggleUntrustedBlockLan(_ sender: UISwitch) {
+        if sender.isOn && Application.shared.settings.connectionProtocol.tunnelType() == .ipsec {
+            showAlert(title: "IKEv2 not supported", message: "Block LAN traffic is supported only for OpenVPN and WireGuard protocols.") { _ in
+                sender.setOn(false, animated: true)
+            }
+            return
+        }
+        
         defaults.set(sender.isOn, forKey: UserDefaults.Key.networkProtectionUntrustedBlockLan)
         Application.shared.connectionManager.evaluateConnection { [self] error in
             if error != nil {
diff --git a/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift b/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift
index a3fa3166a..794762785 100644
--- a/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift
@@ -134,6 +134,10 @@ class ProtocolViewController: UITableViewController {
             return false
         }
         
+        if UserDefaults.shared.networkProtectionUntrustedBlockLan && connectionProtocol == .ipsec {
+            return false
+        }
+        
         return true
     }
     

From bda9c54f5d3b124dd0492d506209b9c7748f2b90 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 21 Nov 2023 21:19:45 +0100
Subject: [PATCH 06/20] feat(network protection): update
 NETunnelProviderProtocol+Ext.swift

---
 .../NETunnelProviderProtocol+Ext.swift           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift b/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
index 8973feabe..ef1461d65 100644
--- a/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
@@ -90,8 +90,8 @@ extension NETunnelProviderProtocol {
         }
         
         if #available(iOS 14.2, *) {
-            proto.includeAllNetworks = UserDefaults.shared.disableLanAccess
-            proto.excludeLocalNetworks = !UserDefaults.shared.disableLanAccess
+            proto.includeAllNetworks = disableLanAccess()
+            proto.excludeLocalNetworks = !disableLanAccess()
         }
         
         return proto
@@ -190,8 +190,8 @@ extension NETunnelProviderProtocol {
         }
         
         if #available(iOS 14.2, *) {
-            configuration.includeAllNetworks = UserDefaults.shared.disableLanAccess
-            configuration.excludeLocalNetworks = !UserDefaults.shared.disableLanAccess
+            configuration.includeAllNetworks = disableLanAccess()
+            configuration.excludeLocalNetworks = !disableLanAccess()
         }
         
         return configuration
@@ -231,4 +231,12 @@ extension NETunnelProviderProtocol {
         return settings.port()
     }
     
+    private static func disableLanAccess() -> Bool {
+        if UserDefaults.shared.networkProtectionEnabled && UserDefaults.shared.networkProtectionUntrustedBlockLan {
+            return true
+        }
+        
+        return UserDefaults.shared.disableLanAccess
+    }
+    
 }

From 989e0cc017c6bc0fc03da847b1476f9c66425bbc Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 21 Nov 2023 21:26:57 +0100
Subject: [PATCH 07/20] feat(network protection): update
 ProtocolViewController.swift

---
 IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift b/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift
index 794762785..53b0d28e7 100644
--- a/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift
@@ -395,6 +395,7 @@ extension ProtocolViewController {
                     switch index {
                     case 0:
                         UserDefaults.shared.set(false, forKey: UserDefaults.Key.disableLanAccess)
+                        UserDefaults.shared.set(false, forKey: UserDefaults.Key.networkProtectionUntrustedBlockLan)
                         tableView.reloadData()
                     default:
                         break

From 6bd354a19d94f65b722e12edcbf7f104068c161c Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Wed, 22 Nov 2023 11:13:50 +0100
Subject: [PATCH 08/20] feat(settings): update UserDefaults+Ext.swift

---
 IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
index f4bd145ca..ec4449b09 100644
--- a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
@@ -94,6 +94,7 @@ extension UserDefaults {
         static let v2raySettings = "v2raySettings"
         static let v2rayProtocol = "v2rayProtocol"
         static let isV2ray = "isV2ray"
+        static let disableWidgetPrompt = "disableWidgetPrompt"
     }
     
     @objc dynamic var wireguardTunnelProviderError: String {
@@ -256,6 +257,10 @@ extension UserDefaults {
         return bool(forKey: Key.isV2ray)
     }
     
+    @objc dynamic var disableWidgetPrompt: Bool {
+        return bool(forKey: Key.disableWidgetPrompt)
+    }
+    
     static func registerUserDefaults() {
         shared.register(defaults: [Key.networkProtectionUntrustedConnect: true])
         shared.register(defaults: [Key.networkProtectionTrustedDisconnect: true])
@@ -296,6 +301,7 @@ extension UserDefaults {
         shared.removeObject(forKey: Key.v2raySettings)
         shared.removeObject(forKey: Key.v2rayProtocol)
         shared.removeObject(forKey: Key.isV2ray)
+        shared.removeObject(forKey: Key.disableWidgetPrompt)
         standard.removeObject(forKey: Key.serviceStatus)
         standard.removeObject(forKey: Key.selectedHost)
         standard.removeObject(forKey: Key.selectedExitHost)

From 738481450c246f97677983c0d8b90b40139ccef1 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Wed, 22 Nov 2023 11:21:19 +0100
Subject: [PATCH 09/20] feat(settings): update AdvancedViewController

---
 IVPNClient/Scenes/Base.lproj/Main.storyboard  | 74 +++++++++++++++----
 .../AdvancedViewController.swift              |  6 ++
 2 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/IVPNClient/Scenes/Base.lproj/Main.storyboard b/IVPNClient/Scenes/Base.lproj/Main.storyboard
index 6ecdb1fd3..b521fec11 100644
--- a/IVPNClient/Scenes/Base.lproj/Main.storyboard
+++ b/IVPNClient/Scenes/Base.lproj/Main.storyboard
@@ -1320,9 +1320,52 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="NetworkProtectionHeaderTableViewCell" rowHeight="80" id="8fq-Nk-KYi">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="NetworkProtectionHeaderTableViewCell" rowHeight="80" id="vNk-Oo-IiC">
                                         <rect key="frame" x="0.0" y="521.5" width="414" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vNk-Oo-IiC" id="wVB-RY-pui">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="80"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qhD-Kj-XVq">
+                                                    <rect key="frame" x="349" y="24.5" width="51" height="31"/>
+                                                    <color key="onTintColor" name="ivpnBlue"/>
+                                                    <connections>
+                                                        <action selector="toggleWidgetPrompt:" destination="cNW-I9-ie7" eventType="valueChanged" id="Zbv-fY-ack"/>
+                                                    </connections>
+                                                </switch>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connect VPN from Widget alert" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="84i-7i-jKk">
+                                                    <rect key="frame" x="16" y="13" width="321" height="20"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="20" id="hfX-Et-Qov"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" name="ivpnLabelPrimary"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Warn me before connecting or disconnecting VPN from the Widget" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vqN-UV-EFu">
+                                                    <rect key="frame" x="16" y="36" width="321" height="32"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                    <color key="textColor" name="ivpnLabel5"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="84i-7i-jKk" firstAttribute="leading" secondItem="wVB-RY-pui" secondAttribute="leading" constant="16" id="BVz-kq-Da7"/>
+                                                <constraint firstItem="qhD-Kj-XVq" firstAttribute="leading" secondItem="84i-7i-jKk" secondAttribute="trailing" constant="12" id="Lbr-mR-Kc8"/>
+                                                <constraint firstItem="vqN-UV-EFu" firstAttribute="leading" secondItem="wVB-RY-pui" secondAttribute="leading" constant="16" id="Se0-sd-Yd2"/>
+                                                <constraint firstItem="84i-7i-jKk" firstAttribute="top" secondItem="wVB-RY-pui" secondAttribute="top" constant="13" id="bEr-sd-BAs"/>
+                                                <constraint firstItem="qhD-Kj-XVq" firstAttribute="centerY" secondItem="wVB-RY-pui" secondAttribute="centerY" id="bij-W0-1rY"/>
+                                                <constraint firstAttribute="bottom" secondItem="vqN-UV-EFu" secondAttribute="bottom" constant="12" id="c2K-gf-10x"/>
+                                                <constraint firstItem="vqN-UV-EFu" firstAttribute="width" secondItem="84i-7i-jKk" secondAttribute="width" id="fhb-C0-IiL"/>
+                                                <constraint firstItem="vqN-UV-EFu" firstAttribute="top" secondItem="84i-7i-jKk" secondAttribute="bottom" constant="3" id="vID-sy-0gn"/>
+                                                <constraint firstAttribute="trailing" secondItem="qhD-Kj-XVq" secondAttribute="trailing" constant="16" id="y9F-PM-VY3"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="NetworkProtectionHeaderTableViewCell" rowHeight="80" id="8fq-Nk-KYi">
+                                        <rect key="frame" x="0.0" y="601.5" width="414" height="80"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8fq-Nk-KYi" id="Ejf-j1-mNu">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="80"/>
                                             <autoresizingMask key="autoresizingMask"/>
@@ -1364,7 +1407,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="NetworkProtectionHeaderTableViewCell" rowHeight="80" id="bOt-4p-lhc">
-                                        <rect key="frame" x="0.0" y="601.5" width="414" height="80"/>
+                                        <rect key="frame" x="0.0" y="681.5" width="414" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bOt-4p-lhc" id="EOw-vM-m9y">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="80"/>
@@ -1411,7 +1454,7 @@
                             <tableViewSection headerTitle="Diagnostic logs" id="sUb-ri-naL">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="60" id="71h-Rn-GiM">
-                                        <rect key="frame" x="0.0" y="737.5" width="414" height="60"/>
+                                        <rect key="frame" x="0.0" y="817.5" width="414" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="71h-Rn-GiM" id="no5-dR-veT">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="60"/>
@@ -1456,7 +1499,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="44" id="OOg-Pf-x1z">
-                                        <rect key="frame" x="0.0" y="797.5" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="877.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OOg-Pf-x1z" id="6Oa-Do-RYN">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
@@ -1499,6 +1542,7 @@
                         <outlet property="sendLogsLabel" destination="Jpg-3d-dAU" id="OKr-90-Yxf"/>
                         <outlet property="v2rayProtocolControl" destination="Qz8-eP-5C1" id="V5g-i0-mWH"/>
                         <outlet property="v2raySwitch" destination="3O9-H5-CkI" id="Iig-EI-FvY"/>
+                        <outlet property="widgetPromptSwitch" destination="qhD-Kj-XVq" id="egI-AG-deN"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="EnU-E8-7lP" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -1977,14 +2021,14 @@
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ProtocolTableViewCell" id="HtI-Zu-PMl" customClass="ProtocolTableViewCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="55.5" width="414" height="43"/>
+                                <rect key="frame" x="0.0" y="55.5" width="414" height="43.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="HtI-Zu-PMl" id="xBM-uI-V8V">
-                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="weu-7I-qbg">
-                                            <rect key="frame" x="16" y="13.5" width="361.5" height="16"/>
+                                            <rect key="frame" x="16" y="14" width="361.5" height="16"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="16" id="K4t-rv-8Rj"/>
                                             </constraints>
@@ -1993,7 +2037,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protocol Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WQ9-eM-bEA">
-                                            <rect key="frame" x="16" y="11" width="359.5" height="21"/>
+                                            <rect key="frame" x="16" y="11" width="359.5" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" name="ivpnLabelPrimary"/>
                                             <nil key="highlightedColor"/>
@@ -2015,7 +2059,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WireGuardRegenerationRateCell" rowHeight="60" id="JLp-oZ-cVy" customClass="WireGuardRegenerationRateCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="98.5" width="414" height="60"/>
+                                <rect key="frame" x="0.0" y="99" width="414" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JLp-oZ-cVy" id="Y7T-PJ-VmA">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="60"/>
@@ -2739,13 +2783,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="HWD-ZW-yW1">
                                                             <rect key="frame" x="0.0" y="0.0" width="213.5" height="56.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your status is" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OqS-im-1xj">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Your status is" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OqS-im-1xj">
                                                                     <rect key="frame" x="0.0" y="0.0" width="213.5" height="18"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="disconnected" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="22" translatesAutoresizingMaskIntoConstraints="NO" id="fZx-j5-ahl">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="disconnected" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="22" translatesAutoresizingMaskIntoConstraints="NO" id="fZx-j5-ahl">
                                                                     <rect key="frame" x="0.0" y="18" width="213.5" height="38.5"/>
                                                                     <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="32"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
@@ -3059,13 +3103,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="QWM-1S-ZSK">
                                                             <rect key="frame" x="0.0" y="0.0" width="79" height="34.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Wi-Fi network" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EZ-JE-Wek">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wi-Fi network" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EZ-JE-Wek">
                                                                     <rect key="frame" x="0.0" y="0.0" width="79" height="14.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULG-XZ-rT5">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULG-XZ-rT5">
                                                                     <rect key="frame" x="0.0" y="17.5" width="79" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
@@ -3119,13 +3163,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="E3R-Ez-ZjT">
                                                             <rect key="frame" x="0.0" y="0.0" width="338.5" height="34.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protocol, Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rBm-y5-gNO">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Protocol, Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rBm-y5-gNO">
                                                                     <rect key="frame" x="0.0" y="0.0" width="338.5" height="14.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfE-oo-iTV">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfE-oo-iTV">
                                                                     <rect key="frame" x="0.0" y="17.5" width="338.5" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
diff --git a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
index 3f433577a..a07397e0b 100644
--- a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
@@ -31,6 +31,7 @@ class AdvancedViewController: UITableViewController {
     
     @IBOutlet weak var disableLanAccessSwitch: UISwitch!
     @IBOutlet weak var askToReconnectSwitch: UISwitch!
+    @IBOutlet weak var widgetPromptSwitch: UISwitch!
     @IBOutlet weak var preventSameCountryMultiHopSwitch: UISwitch!
     @IBOutlet weak var preventSameISPMultiHopSwitch: UISwitch!
     @IBOutlet weak var loggingSwitch: UISwitch!
@@ -91,6 +92,10 @@ class AdvancedViewController: UITableViewController {
         UserDefaults.shared.set(!sender.isOn, forKey: UserDefaults.Key.notAskToReconnect)
     }
     
+    @IBAction func toggleWidgetPrompt(_ sender: UISwitch) {
+        UserDefaults.shared.set(!sender.isOn, forKey: UserDefaults.Key.disableWidgetPrompt)
+    }
+    
     @IBAction func togglePreventSameCountryMultiHop(_ sender: UISwitch) {
         UserDefaults.standard.set(sender.isOn, forKey: UserDefaults.Key.preventSameCountryMultiHop)
     }
@@ -118,6 +123,7 @@ class AdvancedViewController: UITableViewController {
         tableView.backgroundColor = UIColor.init(named: Theme.ivpnBackgroundQuaternary)
         disableLanAccessSwitch.setOn(UserDefaults.shared.disableLanAccess, animated: false)
         askToReconnectSwitch.setOn(!UserDefaults.shared.notAskToReconnect, animated: false)
+        widgetPromptSwitch.setOn(!UserDefaults.shared.disableWidgetPrompt, animated: false)
         preventSameCountryMultiHopSwitch.setOn(UserDefaults.standard.preventSameCountryMultiHop, animated: false)
         preventSameISPMultiHopSwitch.setOn(UserDefaults.standard.preventSameISPMultiHop, animated: false)
         loggingSwitch.setOn(UserDefaults.shared.isLogging, animated: false)

From 29adb6280ae2e95b8080a1faa18bf86546ac99c3 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Wed, 22 Nov 2023 11:24:34 +0100
Subject: [PATCH 10/20] feat(settings): update AppDelegate

---
 IVPNClient/AppDelegate.swift | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/IVPNClient/AppDelegate.swift b/IVPNClient/AppDelegate.swift
index 83c2364a8..5bd838243 100644
--- a/IVPNClient/AppDelegate.swift
+++ b/IVPNClient/AppDelegate.swift
@@ -146,6 +146,15 @@ class AppDelegate: UIResponder {
         
         switch endpoint {
         case Config.urlTypeConnect:
+            guard !UserDefaults.shared.disableWidgetPrompt else {
+                if UserDefaults.shared.networkProtectionEnabled {
+                    Application.shared.connectionManager.resetRulesAndConnectShortcut(closeApp: true, actionType: .connect)
+                    return
+                }
+                Application.shared.connectionManager.connectShortcut(closeApp: true, actionType: .connect)
+                return
+            }
+            
             viewController.showActionAlert(title: "Please confirm", message: "Do you want to connect to VPN?", action: "Connect", actionHandler: { _ in
                 if UserDefaults.shared.networkProtectionEnabled {
                     Application.shared.connectionManager.resetRulesAndConnectShortcut(closeApp: true, actionType: .connect)
@@ -154,6 +163,15 @@ class AppDelegate: UIResponder {
                 Application.shared.connectionManager.connectShortcut(closeApp: true, actionType: .connect)
             })
         case Config.urlTypeDisconnect:
+            guard !UserDefaults.shared.disableWidgetPrompt else {
+                if UserDefaults.shared.networkProtectionEnabled {
+                    Application.shared.connectionManager.resetRulesAndDisconnectShortcut(closeApp: true, actionType: .disconnect)
+                    return
+                }
+                Application.shared.connectionManager.disconnectShortcut(closeApp: true, actionType: .disconnect)
+                return
+            }
+            
             viewController.showActionAlert(title: "Please confirm", message: "Do you want to disconnect from VPN?", action: "Disconnect", actionHandler: { _ in
                 if UserDefaults.shared.networkProtectionEnabled {
                     Application.shared.connectionManager.resetRulesAndDisconnectShortcut(closeApp: true, actionType: .disconnect)

From 7dc911c0b0330f256217203f896f70857998a8a4 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Wed, 22 Nov 2023 14:31:31 +0100
Subject: [PATCH 11/20] fix(ui): update showFloatingPanel method in
 MainViewController

---
 IVPNClient/Scenes/MainScreen/MainViewController.swift | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IVPNClient/Scenes/MainScreen/MainViewController.swift b/IVPNClient/Scenes/MainScreen/MainViewController.swift
index 096097fd2..efaa9804d 100644
--- a/IVPNClient/Scenes/MainScreen/MainViewController.swift
+++ b/IVPNClient/Scenes/MainScreen/MainViewController.swift
@@ -75,6 +75,7 @@ class MainViewController: UIViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        showFloatingPanel()
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -82,9 +83,6 @@ class MainViewController: UIViewController {
         refreshUI()
         initConnectionInfo()
         startPingService()
-        DispatchQueue.async { [self] in
-            showFloatingPanel()
-        }
     }
     
     deinit {
@@ -248,7 +246,7 @@ class MainViewController: UIViewController {
     }
     
     private func showFloatingPanel() {
-        floatingPanel.show(animated: true)
+        floatingPanel.show(animated: false)
     }
     
     private func startAPIUpdate() {

From 5be8c2c7af6f2e80b45ccb39faa902f51299469e Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Fri, 24 Nov 2023 09:25:30 +0100
Subject: [PATCH 12/20] refactor: update .entitlements

---
 IVPNClient/IVPNClient.entitlements                              | 2 --
 openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements    | 2 --
 .../wireguard_tunnel_provider.entitlements                      | 2 --
 3 files changed, 6 deletions(-)

diff --git a/IVPNClient/IVPNClient.entitlements b/IVPNClient/IVPNClient.entitlements
index 0a88a973e..7af37748d 100644
--- a/IVPNClient/IVPNClient.entitlements
+++ b/IVPNClient/IVPNClient.entitlements
@@ -10,8 +10,6 @@
 	<string>NSFileProtectionCompleteUntilFirstUserAuthentication</string>
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
-		<string>app-proxy-provider</string>
-		<string>content-filter-provider</string>
 		<string>packet-tunnel-provider</string>
 	</array>
 	<key>com.apple.developer.networking.vpn.api</key>
diff --git a/openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements b/openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements
index fd8928ae9..d2d16571b 100644
--- a/openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements
+++ b/openvpn-tunnel-provider/openvpn_tunnel_provider.entitlements
@@ -4,8 +4,6 @@
 <dict>
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
-		<string>app-proxy-provider</string>
-		<string>content-filter-provider</string>
 		<string>packet-tunnel-provider</string>
 	</array>
 	<key>com.apple.developer.networking.vpn.api</key>
diff --git a/wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements b/wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements
index fd8928ae9..d2d16571b 100644
--- a/wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements
+++ b/wireguard-tunnel-provider/wireguard_tunnel_provider.entitlements
@@ -4,8 +4,6 @@
 <dict>
 	<key>com.apple.developer.networking.networkextension</key>
 	<array>
-		<string>app-proxy-provider</string>
-		<string>content-filter-provider</string>
 		<string>packet-tunnel-provider</string>
 	</array>
 	<key>com.apple.developer.networking.vpn.api</key>

From 9137ed9d05402ae1c3bd80dd8dda9b096f597782 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Mon, 27 Nov 2023 21:36:59 +0100
Subject: [PATCH 13/20] feat(network protection): add blockLanInfo action in
 AdvancedViewController

---
 IVPNClient/Scenes/Base.lproj/Main.storyboard  | 25 +++++++++++++------
 .../AdvancedViewController.swift              |  4 +++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/IVPNClient/Scenes/Base.lproj/Main.storyboard b/IVPNClient/Scenes/Base.lproj/Main.storyboard
index 6ecdb1fd3..b1ac78668 100644
--- a/IVPNClient/Scenes/Base.lproj/Main.storyboard
+++ b/IVPNClient/Scenes/Base.lproj/Main.storyboard
@@ -21,7 +21,7 @@
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <view key="tableFooterView" contentMode="scaleToFill" id="zK0-8u-72W">
-                            <rect key="frame" x="0.0" y="1287.5" width="414" height="65"/>
+                            <rect key="frame" x="0.0" y="1365.5" width="414" height="65"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="VERSION 0.0.0 (0)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gBW-V1-BW0">
@@ -1171,11 +1171,20 @@
                                                         <action selector="toggleDisableLanAccess:" destination="cNW-I9-ie7" eventType="valueChanged" id="uJi-6C-UW1"/>
                                                     </connections>
                                                 </switch>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s80-hQ-qbA">
+                                                    <rect key="frame" x="294" y="5" width="50" height="34"/>
+                                                    <buttonConfiguration key="configuration" style="plain"/>
+                                                    <connections>
+                                                        <action selector="blockLanInfo:" destination="cNW-I9-ie7" eventType="touchUpInside" id="sfH-67-Npm"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                             <constraints>
+                                                <constraint firstItem="h9L-WL-mhk" firstAttribute="leading" secondItem="s80-hQ-qbA" secondAttribute="trailing" constant="5" id="78J-Zf-3ef"/>
                                                 <constraint firstItem="h9L-WL-mhk" firstAttribute="centerY" secondItem="6vF-rC-vq5" secondAttribute="centerY" id="LkW-x2-YNK"/>
                                                 <constraint firstItem="6Px-e7-mel" firstAttribute="leading" secondItem="6vF-rC-vq5" secondAttribute="leading" constant="16" id="Vsx-3A-pEO"/>
                                                 <constraint firstItem="h9L-WL-mhk" firstAttribute="leading" secondItem="6Px-e7-mel" secondAttribute="trailing" constant="8" id="WXj-OF-tYc"/>
+                                                <constraint firstItem="s80-hQ-qbA" firstAttribute="centerY" secondItem="6vF-rC-vq5" secondAttribute="centerY" id="ZpE-F5-LNu"/>
                                                 <constraint firstAttribute="trailing" secondItem="h9L-WL-mhk" secondAttribute="trailing" constant="16" id="gHx-M2-VOc"/>
                                                 <constraint firstItem="6Px-e7-mel" firstAttribute="centerY" secondItem="6vF-rC-vq5" secondAttribute="centerY" id="iv3-tP-Ucz"/>
                                             </constraints>
@@ -1977,14 +1986,14 @@
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ProtocolTableViewCell" id="HtI-Zu-PMl" customClass="ProtocolTableViewCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="55.5" width="414" height="43"/>
+                                <rect key="frame" x="0.0" y="55.5" width="414" height="43.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="HtI-Zu-PMl" id="xBM-uI-V8V">
-                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="weu-7I-qbg">
-                                            <rect key="frame" x="16" y="13.5" width="361.5" height="16"/>
+                                            <rect key="frame" x="16" y="14" width="361.5" height="16"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="16" id="K4t-rv-8Rj"/>
                                             </constraints>
@@ -1993,7 +2002,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protocol Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WQ9-eM-bEA">
-                                            <rect key="frame" x="16" y="11" width="359.5" height="21"/>
+                                            <rect key="frame" x="16" y="11" width="359.5" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" name="ivpnLabelPrimary"/>
                                             <nil key="highlightedColor"/>
@@ -2015,7 +2024,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WireGuardRegenerationRateCell" rowHeight="60" id="JLp-oZ-cVy" customClass="WireGuardRegenerationRateCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="98.5" width="414" height="60"/>
+                                <rect key="frame" x="0.0" y="99" width="414" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JLp-oZ-cVy" id="Y7T-PJ-VmA">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="60"/>
@@ -3059,13 +3068,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="QWM-1S-ZSK">
                                                             <rect key="frame" x="0.0" y="0.0" width="79" height="34.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Wi-Fi network" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EZ-JE-Wek">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wi-Fi network" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8EZ-JE-Wek">
                                                                     <rect key="frame" x="0.0" y="0.0" width="79" height="14.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULG-XZ-rT5">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULG-XZ-rT5">
                                                                     <rect key="frame" x="0.0" y="17.5" width="79" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
diff --git a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
index 3f433577a..e2ffd1491 100644
--- a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
@@ -105,6 +105,10 @@ class AdvancedViewController: UITableViewController {
         setupLoggingView()
     }
     
+    @IBAction func blockLanInfo(_ sender: UIButton) {
+        showAlert(title: "Info", message: "'Network Protection' actions for untrusted networks will override this option.")
+    }
+    
     // MARK: - View Lifecycle -
     
     override func viewWillAppear(_ animated: Bool) {

From c13bf29330db5f4ffe314d5cc4529974a2c1799e Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Mon, 27 Nov 2023 21:45:23 +0100
Subject: [PATCH 14/20] feat(network protection): update disableLanAccess
 method

in NETunnelProviderProtocol+Ext.swift
---
 .../Utilities/Extensions/NETunnelProviderProtocol+Ext.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift b/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
index ef1461d65..7c87819db 100644
--- a/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
@@ -232,7 +232,11 @@ extension NETunnelProviderProtocol {
     }
     
     private static func disableLanAccess() -> Bool {
-        if UserDefaults.shared.networkProtectionEnabled && UserDefaults.shared.networkProtectionUntrustedBlockLan {
+        let defaultTrust = StorageManager.getDefaultTrust()
+        let networkTrust = Application.shared.network.trust ?? NetworkTrust.Default.rawValue
+        let trust = StorageManager.trustValue(trust: networkTrust, defaultTrust: defaultTrust)
+        
+        if UserDefaults.shared.networkProtectionEnabled && UserDefaults.shared.networkProtectionUntrustedBlockLan && trust == NetworkTrust.Untrusted.rawValue {
             return true
         }
         

From 49b61b6327ce8e546191df019db3eb73f9f71e28 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 28 Nov 2023 11:57:32 +0100
Subject: [PATCH 15/20] feat(network protection): update
 toggleUntrustedBlockLan method

in NetworkProtectionRulesViewController.swift
---
 .../NetworkProtectionRulesViewController.swift              | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
index 61fe0fffd..af1ea6020 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
@@ -48,11 +48,7 @@ class NetworkProtectionRulesViewController: UITableViewController {
         }
         
         defaults.set(sender.isOn, forKey: UserDefaults.Key.networkProtectionUntrustedBlockLan)
-        Application.shared.connectionManager.evaluateConnection { [self] error in
-            if error != nil {
-                showWireGuardKeysMissingError()
-            }
-        }
+        evaluateReconnect(sender: sender as UIView)
     }
     
     @IBAction func blockLanInfo(_ sender: UIButton) {

From 5a04d9dc8db74ddfa8ba7972bf0090d926c85e0c Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 28 Nov 2023 12:41:26 +0100
Subject: [PATCH 16/20] fix(network protection): update NEVPNStatus+Ext.swift

---
 IVPNClient/Managers/VPNManager.swift                  | 6 ++++++
 IVPNClient/Utilities/Extensions/NEVPNStatus+Ext.swift | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/IVPNClient/Managers/VPNManager.swift b/IVPNClient/Managers/VPNManager.swift
index 0f3473984..c2cfc37cd 100644
--- a/IVPNClient/Managers/VPNManager.swift
+++ b/IVPNClient/Managers/VPNManager.swift
@@ -236,6 +236,10 @@ class VPNManager {
                 self.disable(tunnelType: .wireguard) { _ in
                     self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
                         self.disconnect(tunnelType: .ipsec)
+                        // Fix for iOS 16+ bug where VPN status is .disconnecting for active on-demand rules and disconnected VPN
+                        DispatchQueue.delay(1) {
+                            self.ipsecManager?.connection.stopVPNTunnel()
+                        }
                     }
                 }
             }
@@ -243,6 +247,7 @@ class VPNManager {
             disable(tunnelType: .ipsec) { _ in
                 self.disable(tunnelType: .wireguard) { _ in
                     self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
+                        // Fix for iOS 16+ bug where VPN status is .disconnecting for active on-demand rules and disconnected VPN
                         DispatchQueue.delay(1) {
                             self.openvpnManager?.connection.stopVPNTunnel()
                         }
@@ -253,6 +258,7 @@ class VPNManager {
             disable(tunnelType: .ipsec) { _ in
                 self.disable(tunnelType: .openvpn) { _ in
                     self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
+                        // Fix for iOS 16+ bug where VPN status is .disconnecting for active on-demand rules and disconnected VPN
                         DispatchQueue.delay(1) {
                             self.wireguardManager?.connection.stopVPNTunnel()
                         }
diff --git a/IVPNClient/Utilities/Extensions/NEVPNStatus+Ext.swift b/IVPNClient/Utilities/Extensions/NEVPNStatus+Ext.swift
index 29c570e07..1fd611307 100644
--- a/IVPNClient/Utilities/Extensions/NEVPNStatus+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/NEVPNStatus+Ext.swift
@@ -26,6 +26,11 @@ import NetworkExtension
 extension NEVPNStatus {
     
     func isDisconnected() -> Bool {
+        // Fix for iOS 16+ bug where VPN status is .disconnecting for active on-demand rules and disconnected VPN
+        if UserDefaults.shared.networkProtectionEnabled {
+            return self == .disconnected || self == .disconnecting || self == .invalid
+        }
+        
         return self == .disconnected || self == .invalid
     }
     

From cfb5eb6e913275b2e98988c2c6bcdafe922fb97c Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Wed, 29 Nov 2023 10:27:35 +0100
Subject: [PATCH 17/20] feat: evaluate background key rotation every 10min

---
 IVPNClient/Managers/AppKeyManager.swift              | 2 +-
 wireguard-tunnel-provider/PacketTunnelProvider.swift | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/IVPNClient/Managers/AppKeyManager.swift b/IVPNClient/Managers/AppKeyManager.swift
index 732243d23..09800cfd8 100644
--- a/IVPNClient/Managers/AppKeyManager.swift
+++ b/IVPNClient/Managers/AppKeyManager.swift
@@ -76,7 +76,7 @@ class AppKeyManager {
             return TimeInterval(10)
         }
         
-        return TimeInterval(60 * 60)
+        return TimeInterval(60 * 10)
     }
     
     static var regenerationInterval: TimeInterval {
diff --git a/wireguard-tunnel-provider/PacketTunnelProvider.swift b/wireguard-tunnel-provider/PacketTunnelProvider.swift
index fe980f016..3a22ead3f 100644
--- a/wireguard-tunnel-provider/PacketTunnelProvider.swift
+++ b/wireguard-tunnel-provider/PacketTunnelProvider.swift
@@ -145,7 +145,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
     }
     
     private func startKeyRegenerationMonitor(completion: @escaping (Error?) -> Void) {
-        evaluateKeyRotation(completion)
         let timer = TimerManager(timeInterval: AppKeyManager.regenerationCheckInterval)
         timer.eventHandler = {
             self.evaluateKeyRotation(completion)

From 87b85be320dff11fbc13c4b833b7907d253eb44e Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Thu, 30 Nov 2023 10:24:12 +0100
Subject: [PATCH 18/20] feat(network protection): update blockLanInfo alert
 message

---
 .../ViewControllers/NetworkProtectionRulesViewController.swift  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
index af1ea6020..7d66a78f6 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
@@ -52,7 +52,7 @@ class NetworkProtectionRulesViewController: UITableViewController {
     }
     
     @IBAction func blockLanInfo(_ sender: UIButton) {
-        showAlert(title: "Info", message: "When enabled, it overrides the 'Block LAN traffic' option in Advanced Settings.")
+        showAlert(title: "Info", message: "When enabled, it overrides the 'Block LAN traffic' option in Advanced Settings, when connected to an untrusted network.")
     }
     
     @IBAction func toggleTrustedDisconnect(_ sender: UISwitch) {

From ff2de04d7742015efcf0de736ccbbbb9893d6d20 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Thu, 30 Nov 2023 16:55:10 +0100
Subject: [PATCH 19/20] feat(network protection): update blockLanInfo alert
 message

---
 IVPNClient/Scenes/Base.lproj/Main.storyboard  | 23 ++++++-------------
 .../AdvancedViewController.swift              |  4 ----
 ...NetworkProtectionRulesViewController.swift |  2 +-
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/IVPNClient/Scenes/Base.lproj/Main.storyboard b/IVPNClient/Scenes/Base.lproj/Main.storyboard
index bd66db116..4f04e5a7c 100644
--- a/IVPNClient/Scenes/Base.lproj/Main.storyboard
+++ b/IVPNClient/Scenes/Base.lproj/Main.storyboard
@@ -1171,20 +1171,11 @@
                                                         <action selector="toggleDisableLanAccess:" destination="cNW-I9-ie7" eventType="valueChanged" id="uJi-6C-UW1"/>
                                                     </connections>
                                                 </switch>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s80-hQ-qbA">
-                                                    <rect key="frame" x="294" y="5" width="50" height="34"/>
-                                                    <buttonConfiguration key="configuration" style="plain"/>
-                                                    <connections>
-                                                        <action selector="blockLanInfo:" destination="cNW-I9-ie7" eventType="touchUpInside" id="sfH-67-Npm"/>
-                                                    </connections>
-                                                </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="h9L-WL-mhk" firstAttribute="leading" secondItem="s80-hQ-qbA" secondAttribute="trailing" constant="5" id="78J-Zf-3ef"/>
                                                 <constraint firstItem="h9L-WL-mhk" firstAttribute="centerY" secondItem="6vF-rC-vq5" secondAttribute="centerY" id="LkW-x2-YNK"/>
                                                 <constraint firstItem="6Px-e7-mel" firstAttribute="leading" secondItem="6vF-rC-vq5" secondAttribute="leading" constant="16" id="Vsx-3A-pEO"/>
                                                 <constraint firstItem="h9L-WL-mhk" firstAttribute="leading" secondItem="6Px-e7-mel" secondAttribute="trailing" constant="8" id="WXj-OF-tYc"/>
-                                                <constraint firstItem="s80-hQ-qbA" firstAttribute="centerY" secondItem="6vF-rC-vq5" secondAttribute="centerY" id="ZpE-F5-LNu"/>
                                                 <constraint firstAttribute="trailing" secondItem="h9L-WL-mhk" secondAttribute="trailing" constant="16" id="gHx-M2-VOc"/>
                                                 <constraint firstItem="6Px-e7-mel" firstAttribute="centerY" secondItem="6vF-rC-vq5" secondAttribute="centerY" id="iv3-tP-Ucz"/>
                                             </constraints>
@@ -2030,14 +2021,14 @@
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ProtocolTableViewCell" id="HtI-Zu-PMl" customClass="ProtocolTableViewCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="55.5" width="414" height="43.5"/>
+                                <rect key="frame" x="0.0" y="55.5" width="414" height="43"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="HtI-Zu-PMl" id="xBM-uI-V8V">
-                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="383.5" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="weu-7I-qbg">
-                                            <rect key="frame" x="16" y="14" width="361.5" height="16"/>
+                                            <rect key="frame" x="16" y="13.5" width="361.5" height="16"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="16" id="K4t-rv-8Rj"/>
                                             </constraints>
@@ -2046,7 +2037,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protocol Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WQ9-eM-bEA">
-                                            <rect key="frame" x="16" y="11" width="359.5" height="21.5"/>
+                                            <rect key="frame" x="16" y="11" width="359.5" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" name="ivpnLabelPrimary"/>
                                             <nil key="highlightedColor"/>
@@ -2068,7 +2059,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="WireGuardRegenerationRateCell" rowHeight="60" id="JLp-oZ-cVy" customClass="WireGuardRegenerationRateCell" customModule="IVPNClient" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="99" width="414" height="60"/>
+                                <rect key="frame" x="0.0" y="98.5" width="414" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="JLp-oZ-cVy" id="Y7T-PJ-VmA">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="60"/>
@@ -2792,13 +2783,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="HWD-ZW-yW1">
                                                             <rect key="frame" x="0.0" y="0.0" width="213.5" height="56.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Your status is" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OqS-im-1xj">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your status is" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OqS-im-1xj">
                                                                     <rect key="frame" x="0.0" y="0.0" width="213.5" height="18"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="disconnected" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="22" translatesAutoresizingMaskIntoConstraints="NO" id="fZx-j5-ahl">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="disconnected" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="22" translatesAutoresizingMaskIntoConstraints="NO" id="fZx-j5-ahl">
                                                                     <rect key="frame" x="0.0" y="18" width="213.5" height="38.5"/>
                                                                     <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="32"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
diff --git a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
index f3c83f693..a07397e0b 100644
--- a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
@@ -110,10 +110,6 @@ class AdvancedViewController: UITableViewController {
         setupLoggingView()
     }
     
-    @IBAction func blockLanInfo(_ sender: UIButton) {
-        showAlert(title: "Info", message: "'Network Protection' actions for untrusted networks will override this option.")
-    }
-    
     // MARK: - View Lifecycle -
     
     override func viewWillAppear(_ animated: Bool) {
diff --git a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
index 7d66a78f6..e22d4ddda 100644
--- a/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
@@ -52,7 +52,7 @@ class NetworkProtectionRulesViewController: UITableViewController {
     }
     
     @IBAction func blockLanInfo(_ sender: UIButton) {
-        showAlert(title: "Info", message: "When enabled, it overrides the 'Block LAN traffic' option in Advanced Settings, when connected to an untrusted network.")
+        showAlert(title: "Info", message: "When enabled, LAN traffic will be blocked when connected to an untrusted network.")
     }
     
     @IBAction func toggleTrustedDisconnect(_ sender: UISwitch) {

From de05246c6313e25e397c56acb95f4727b8de4be9 Mon Sep 17 00:00:00 2001
From: Juraj Hilje <juraj.hilje@gmail.com>
Date: Tue, 5 Dec 2023 10:01:10 +0100
Subject: [PATCH 20/20] docs: update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2a0e04bd..1fd220405 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.11.1 - 2023-12-05  
+
+[NEW] Option to Block LAN traffic when connected to an untrusted network  
+[NEW] Option to turn off the prompt when connecting or disconnecting VPN from the Widget  
+[FIXED] Control panel not rendering when launching the app in landscape mode on iPad  
+[FIXED] Removed redundant entitlements for V2Ray connections  
+[FIXED] Minor UI fixes and improvements  
+
 ## 2.11.0 - 2023-11-16  
 
 [NEW] Obfuscation with V2Ray for WireGuard connections