Skip to content

Commit

Permalink
feat(network protection): update blockLanInfo alert message
Browse files Browse the repository at this point in the history
  • Loading branch information
@jurajhilje
jurajhilje committed Nov 30, 2023
1 parent 87b85be commit ff2de04
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 21 deletions.
23 changes: 7 additions & 16 deletions IVPNClient/Scenes/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down
4 changes: 0 additions & 4 deletions IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion IVPNClient/Scenes/ViewControllers/NetworkProtectionRulesViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit ff2de04

Please sign in to comment.