#34: Add UI to edit the preferences

- UI to ignore the SSIDs and hide the VPNs
Timac · Apr 12, 2024 · 3d7ef5f · 3d7ef5f
1 parent 85089c0
commit 3d7ef5f
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 5 deletions.
diff --git a/Common/ACPreferences.h b/Common/ACPreferences.h
@@ -27,12 +27,14 @@
  Return the list of ignored SSIDs for the current service identifier
  */
 -(NSArray<NSString *>*)ignoredSSIDs;
+-(void)setIgnoredSSIDs:(NSArray<NSString *> *)ignoredSSIDs;
 
 
 /**
  Return the list of VPN to ignore
  */
 -(NSArray<NSString *>*)ignoredVPNs;
+-(void)setIgnoredVPNs:(NSArray<NSString *> *)ignoredVPNs;
 
 
 /**

diff --git a/Common/ACPreferences.m b/Common/ACPreferences.m
@@ -103,7 +103,27 @@ -(void)setAlwaysConnected:(BOOL)inAlwaysConnected forServicesIdentifier:(NSStrin
 -(NSArray<NSString *> *)ignoredSSIDs
 {
     NSString *ignoredSSIDsString = [[NSUserDefaults standardUserDefaults] stringForKey:kServiceIgnoredSSIDsKey];
-    return [ignoredSSIDsString componentsSeparatedByString:@","];
+	if([ignoredSSIDsString length] > 0)
+	{
+		return [ignoredSSIDsString componentsSeparatedByString:@","];
+	}
+	else
+	{
+		return @[];
+	}
+}
+
+-(void)setIgnoredSSIDs:(NSArray<NSString *> *)ignoredSSIDs
+{
+	if([ignoredSSIDs count] <= 0)
+	{
+		[[NSUserDefaults standardUserDefaults] removeObjectForKey:kServiceIgnoredSSIDsKey];
+	}
+	else
+	{
+		NSString *value = [ignoredSSIDs componentsJoinedByString:@","];
+		[[NSUserDefaults standardUserDefaults] setValue:value forKey:kServiceIgnoredSSIDsKey];
+	}
 }
 
 /**
@@ -121,10 +141,23 @@ -(void)setAlwaysConnected:(BOOL)inAlwaysConnected forServicesIdentifier:(NSStrin
 		// Don't display the Little Snitch Content Filter Configuration
 		ignoredVPNsString = @"Little Snitch";
 	}
-	
+
 	return [ignoredVPNsString componentsSeparatedByString:@","];
 }
 
+-(void)setIgnoredVPNs:(NSArray<NSString *> *)ignoredVPNs
+{
+	if([ignoredVPNs count] <= 0)
+	{
+		[[NSUserDefaults standardUserDefaults] removeObjectForKey:kServiceIgnoredVPNsKey];
+	}
+	else
+	{
+		NSString *value = [ignoredVPNs componentsJoinedByString:@","];
+		[[NSUserDefaults standardUserDefaults] setValue:value forKey:kServiceIgnoredVPNsKey];
+	}
+}
+
 -(NSInteger)alwaysConnectedRetryDelay
 {
 	NSInteger retryDelay = [[NSUserDefaults standardUserDefaults] integerForKey:kAlwaysConnectedRetryDelayPrefKey];

diff --git a/VPN.xcodeproj/project.pbxproj b/VPN.xcodeproj/project.pbxproj
@@ -24,6 +24,8 @@
 		024D90122BC72567005BF977 /* GitHubRelease.swift in Sources */ = {isa = PBXBuildFile; fileRef = 024D90002BC71157005BF977 /* GitHubRelease.swift */; };
 		024D903C2BC7B230005BF977 /* ACCheckForUpdateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 024D903B2BC7B230005BF977 /* ACCheckForUpdateView.swift */; };
 		024D903E2BC7B904005BF977 /* ACCheckForUpdateViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 024D903D2BC7B904005BF977 /* ACCheckForUpdateViewFactory.swift */; };
+		024D90552BC9AE8F005BF977 /* ACPreferencesIgnoredView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 024D90532BC9AE8F005BF977 /* ACPreferencesIgnoredView.xib */; };
+		024D90582BC9AEB2005BF977 /* ACPreferencesIgnoredViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 024D90572BC9AEB2005BF977 /* ACPreferencesIgnoredViewController.m */; };
 		02619DE820F7DF2200099652 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 02619DE720F7DF2200099652 /* AppDelegate.m */; };
 		02619DEA20F7DF2400099652 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 02619DE920F7DF2400099652 /* Assets.xcassets */; };
 		02619DED20F7DF2400099652 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 02619DEB20F7DF2400099652 /* MainMenu.xib */; };
@@ -112,6 +114,9 @@
 		024D90082BC71C04005BF977 /* GitHubReleaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitHubReleaseTests.swift; sourceTree = "<group>"; };
 		024D903B2BC7B230005BF977 /* ACCheckForUpdateView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ACCheckForUpdateView.swift; sourceTree = "<group>"; };
 		024D903D2BC7B904005BF977 /* ACCheckForUpdateViewFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ACCheckForUpdateViewFactory.swift; sourceTree = "<group>"; };
+		024D90542BC9AE8F005BF977 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ACPreferencesIgnoredView.xib; sourceTree = "<group>"; };
+		024D90562BC9AEB2005BF977 /* ACPreferencesIgnoredViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ACPreferencesIgnoredViewController.h; sourceTree = "<group>"; };
+		024D90572BC9AEB2005BF977 /* ACPreferencesIgnoredViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ACPreferencesIgnoredViewController.m; sourceTree = "<group>"; };
 		02619DE420F7DF2200099652 /* VPNStatus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VPNStatus.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		02619DE620F7DF2200099652 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		02619DE720F7DF2200099652 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -207,13 +212,15 @@
 			children = (
 				024D8FE02BC50D28005BF977 /* NSBundle+ACAppInfo.h */,
 				024D8FDF2BC50D28005BF977 /* NSBundle+ACAppInfo.m */,
+				024D8FD42BC1DF32005BF977 /* ACPreferencesWindowControllerProtocol.h */,
+				024D8FD22BC1DF32005BF977 /* ACPreferencesWindowController.h */,
+				024D8FD32BC1DF32005BF977 /* ACPreferencesWindowController.m */,
 				024D8FD02BC1DF32005BF977 /* ACPreferencesGeneralViewController.h */,
 				024D8FD12BC1DF32005BF977 /* ACPreferencesGeneralViewController.m */,
 				024D8FD82BC1E6FB005BF977 /* ACPreferencesAboutViewController.h */,
 				024D8FD92BC1E6FC005BF977 /* ACPreferencesAboutViewController.m */,
-				024D8FD22BC1DF32005BF977 /* ACPreferencesWindowController.h */,
-				024D8FD32BC1DF32005BF977 /* ACPreferencesWindowController.m */,
-				024D8FD42BC1DF32005BF977 /* ACPreferencesWindowControllerProtocol.h */,
+				024D90562BC9AEB2005BF977 /* ACPreferencesIgnoredViewController.h */,
+				024D90572BC9AEB2005BF977 /* ACPreferencesIgnoredViewController.m */,
 			);
 			path = PreferencesUI;
 			sourceTree = "<group>";
@@ -260,6 +267,7 @@
 				024D8FE22BC51118005BF977 /* ACCrossPromotionWindow.xib */,
 				024D8FCA2BC1DE38005BF977 /* ACPreferencesGeneralView.xib */,
 				024D8FDB2BC1E719005BF977 /* ACPreferencesAboutView.xib */,
+				024D90532BC9AE8F005BF977 /* ACPreferencesIgnoredView.xib */,
 				024D8FCC2BC1DE38005BF977 /* ACPreferencesWindow.xib */,
 				02619DEE20F7DF2400099652 /* Info.plist */,
 				02619DEF20F7DF2400099652 /* main.m */,
@@ -516,6 +524,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				024D90552BC9AE8F005BF977 /* ACPreferencesIgnoredView.xib in Resources */,
 				024D8FE42BC51118005BF977 /* ACCrossPromotionWindow.xib in Resources */,
 				024D8FCE2BC1DE38005BF977 /* ACPreferencesGeneralView.xib in Resources */,
 				024D8FCF2BC1DE38005BF977 /* ACPreferencesWindow.xib in Resources */,
@@ -579,6 +588,7 @@
 				02619DFF20F7F7BF00099652 /* ACPreferences.m in Sources */,
 				028DF1172AC7FA200084A822 /* ACLocationManager.m in Sources */,
 				0231297C20F9F8CF003F7540 /* ACConnectionManager.m in Sources */,
+				024D90582BC9AEB2005BF977 /* ACPreferencesIgnoredViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -649,6 +659,14 @@
 			name = ACCrossPromotionWindow.xib;
 			sourceTree = "<group>";
 		};
+		024D90532BC9AE8F005BF977 /* ACPreferencesIgnoredView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				024D90542BC9AE8F005BF977 /* Base */,
+			);
+			name = ACPreferencesIgnoredView.xib;
+			sourceTree = "<group>";
+		};
 		02619DEB20F7DF2400099652 /* MainMenu.xib */ = {
 			isa = PBXVariantGroup;
 			children = (