Skip to content

Setting for only one service being AlwaysConnected #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Timac merged 6 commits into from
Oct 2, 2024
Merged

Setting for only one service being AlwaysConnected #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75905aa
Add checkbox setting for single auto connect
halo Sep 24, 2024
cd3fcc4
Deactivate AlwaysConnected for other services
halo Oct 2, 2024
095cf25
Fix the layout constraints for the checkbox setting for single auto c…
Timac Oct 2, 2024
4f0ab1f
Fix spaces vs tabs
Timac Oct 2, 2024
17658cb
Only deactivate AlwaysConnected for other services when enabling one …
Timac Oct 2, 2024
07155e6
Use a copy to avoid looping through an array that is being modified d…
Timac Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Common/ACPreferences.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ extern NSString * const kACMenuBarImageDidChange;
-(void)setDisabledCheckForUpdatesAutomatically:(BOOL)inValue;


/**
Enable auto connecting to max one service.
*/
-(BOOL)singleAutoConnect;
-(void)setSingleAutoConnect:(BOOL)inValue;


/**
Menu Bar Images
*/
Expand Down
23 changes: 21 additions & 2 deletions Common/ACPreferences.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
NSString * const kAlwaysConnectedRetryDelayPrefKey = @"AlwaysConnectedRetryDelay";

NSString * const kDisabledCheckForUpdatesAutomaticallyPrefKey = @"DisabledCheckForUpdatesAutomatically";
NSString * const kSingleAutoConnectPrefKey = @"SingleAutoConnect";
NSString * const kMenuBarImageTypePrefKey = @"MenuBarImageType";

NSString * const kACConfigurationDidChange = @"kACConfigurationDidChange";
Expand Down Expand Up @@ -68,7 +69,8 @@ -(void)setAlwaysConnected:(BOOL)inAlwaysConnected forServicesIdentifier:(NSStrin
services = [[NSMutableArray alloc] init];
}

for(NSDictionary *service in services)
// Use a copy to avoid looping through an array that is being modified during the loop
for(NSDictionary *service in [services copy])
{
NSString *serviceIdentifier = service[kServiceIdentifierKey];
if([serviceIdentifier isEqualToString:inServiceIdentifier])
Expand All @@ -80,7 +82,14 @@ -(void)setAlwaysConnected:(BOOL)inAlwaysConnected forServicesIdentifier:(NSStrin
[services addObject:updatedServiceDictionary];

serviceFound = YES;
break;
}
else if(inAlwaysConnected && [self singleAutoConnect])
{
NSMutableDictionary *updatedServiceDictionary = [service mutableCopy];
updatedServiceDictionary[kServiceAlwaysConnectedKey] = [NSNumber numberWithBool:false];

[services removeObject:service];
[services addObject:updatedServiceDictionary];
}
}

Expand Down Expand Up @@ -202,6 +211,16 @@ -(void)setDisabledCheckForUpdatesAutomatically:(BOOL)inValue
[[NSUserDefaults standardUserDefaults] setBool:inValue forKey:kDisabledCheckForUpdatesAutomaticallyPrefKey];
}

-(BOOL)singleAutoConnect
{
return [[NSUserDefaults standardUserDefaults] boolForKey:kSingleAutoConnectPrefKey];
}

-(void)setSingleAutoConnect:(BOOL)inValue
{
[[NSUserDefaults standardUserDefaults] setBool:inValue forKey:kSingleAutoConnectPrefKey];
}

-(MenuBarImageType)menuBarImageType
{
return [[NSUserDefaults standardUserDefaults] integerForKey:kMenuBarImageTypePrefKey];
Expand Down
18 changes: 9 additions & 9 deletions VPNStatus/Base.lproj/ACCrossPromotionWindow.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
<capability name="Image references" minToolsVersion="12.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -17,7 +17,7 @@
<window title="From the same developer" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" id="xOd-HO-29H" userLabel="Window">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<rect key="contentRect" x="133" y="235" width="471" height="303"/>
<rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
<rect key="screenRect" x="0.0" y="0.0" width="1710" height="1069"/>
<value key="minSize" type="size" width="471" height="303"/>
<value key="maxSize" type="size" width="471" height="303"/>
<value key="minFullScreenContentSize" type="size" width="471" height="303"/>
Expand Down Expand Up @@ -62,15 +62,15 @@
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="3" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pNf-j0-tGB">
<rect key="frame" x="82" y="22" width="150" height="33"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zeg-Ha-1do">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zeg-Ha-1do">
<rect key="frame" x="-2" y="17" width="73" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="MarkChart" id="yQk-ZW-ZYH">
<font key="font" textStyle="headline" name=".SFNS-Bold"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OK1-bJ-hmH">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OK1-bJ-hmH">
<rect key="frame" x="-2" y="0.0" width="146" height="14"/>
<textFieldCell key="cell" title="Preview Mermaid diagrams" id="6iB-aD-z2o">
<font key="font" textStyle="subheadline" name=".SFNS-Regular"/>
Expand Down Expand Up @@ -146,15 +146,15 @@
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="3" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VC1-Ul-sCi">
<rect key="frame" x="82" y="22" width="150" height="33"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ekS-uP-1kK">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ekS-uP-1kK">
<rect key="frame" x="-2" y="17" width="96" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Dependencies" id="upD-tw-8po">
<font key="font" textStyle="headline" name=".SFNS-Bold"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K6P-fm-abg">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K6P-fm-abg">
<rect key="frame" x="-2" y="0.0" width="95" height="14"/>
<textFieldCell key="cell" title="Analyze your app" id="Ed8-7V-oc8">
<font key="font" textStyle="subheadline" name=".SFNS-Regular"/>
Expand Down Expand Up @@ -230,15 +230,15 @@
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="3" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="n5d-8b-0PC">
<rect key="frame" x="82" y="22" width="150" height="33"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ie8-la-hfc">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ie8-la-hfc">
<rect key="frame" x="-2" y="17" width="75" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="VPNStatus" id="gbX-YX-ycX">
<font key="font" textStyle="headline" name=".SFNS-Bold"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cCl-MV-z0B">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cCl-MV-z0B">
<rect key="frame" x="-2" y="0.0" width="123" height="14"/>
<textFieldCell key="cell" title="Auto connect to a VPN" id="Vr0-nT-DxM">
<font key="font" textStyle="subheadline" name=".SFNS-Regular"/>
Expand Down
10 changes: 5 additions & 5 deletions VPNStatus/Base.lproj/ACPreferencesAboutView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -27,23 +27,23 @@
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="icon" id="5NO-xE-yFC"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K3Q-df-0o3">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K3Q-df-0o3">
<rect key="frame" x="261" y="209" width="79" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="VPNStatus" id="c4R-ke-SFN">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dkf-TQ-yQo">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dkf-TQ-yQo">
<rect key="frame" x="276" y="187" width="48" height="14"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Version" id="fsO-os-8rb">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yL7-wI-Gad">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yL7-wI-Gad">
<rect key="frame" x="215" y="153" width="171" height="14"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Copyright © Alexandre Colucci" id="10m-WU-1rH">
<font key="font" metaFont="smallSystem"/>
Expand Down
Loading