icybear/sing-box-for-apple
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add back include all networks option

Browse Source
This commit is contained in:
世界
2023-09-19 17:48:13 +08:00
parent c73c118926
commit 45d2b9b644
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibrary/Views/Setting/SettingView.swift
+8
View File
@@ -22,6 +22,7 @@ public struct SettingView: View {
@State private var alwaysOn = false @State private var alwaysOn = false
@State private var disableMemoryLimit = false @State private var disableMemoryLimit = false
@State private var includeAllNetworks = false
@State private var version = "" @State private var version = ""
@State private var dataSize = "" @State private var dataSize = ""
@State private var taiwanFlagAvailable = false @State private var taiwanFlagAvailable = false
@@ -80,6 +81,12 @@ public struct SettingView: View {
SharedPreferences.disableMemoryLimit = newValue SharedPreferences.disableMemoryLimit = newValue
} }
} }
Toggle("Include All Networks", isOn: $includeAllNetworks)
.onChangeCompat(of: includeAllNetworks) { newValue in
Task.detached {
SharedPreferences.includeAllNetworks = newValue
}
}
#if os(macOS) #if os(macOS)
if Variant.useSystemExtension { if Variant.useSystemExtension {
HStack { HStack {
@@ -165,6 +172,7 @@ public struct SettingView: View {
#endif #endif
alwaysOn = SharedPreferences.alwaysOn alwaysOn = SharedPreferences.alwaysOn
disableMemoryLimit = SharedPreferences.disableMemoryLimit disableMemoryLimit = SharedPreferences.disableMemoryLimit
includeAllNetworks = SharedPreferences.includeAllNetworks
version = LibboxVersion() version = LibboxVersion()
if ApplicationLibrary.inPreview { if ApplicationLibrary.inPreview {
dataSize = LibboxFormatBytes(1024 * 1024 * 10) dataSize = LibboxFormatBytes(1024 * 1024 * 10)
Library/Database/SharedPreferences.swift
+1
View File
@@ -9,6 +9,7 @@ public enum SharedPreferences {
private static let disableMemoryLimitByDefault = false private static let disableMemoryLimitByDefault = false
#endif #endif
@Preference<Bool>("disable_memory_limit", defaultValue: disableMemoryLimitByDefault) public static var disableMemoryLimit @Preference<Bool>("disable_memory_limit", defaultValue: disableMemoryLimitByDefault) public static var disableMemoryLimit
@Preference<Bool>("include_all_networks", defaultValue: false) public static var includeAllNetworks
@Preference<Int>("max_log_lines", defaultValue: 300) public static var maxLogLines @Preference<Int>("max_log_lines", defaultValue: 300) public static var maxLogLines
@Preference<Bool>("always_on", defaultValue: false) public static var alwaysOn @Preference<Bool>("always_on", defaultValue: false) public static var alwaysOn
Library/Network/ExtensionProfile.swift
+3
View File
@@ -58,6 +58,9 @@ public class ExtensionProfile: ObservableObject {
manager.isOnDemandEnabled = true manager.isOnDemandEnabled = true
setOnDemandRules() setOnDemandRules()
} }
if let protocolConfiguration = manager.protocolConfiguration {
protocolConfiguration.includeAllNetworks = SharedPreferences.includeAllNetworks
}
try await manager.saveToPreferences() try await manager.saveToPreferences()
#if os(macOS) #if os(macOS)
if Variant.useSystemExtension { if Variant.useSystemExtension {
sing-box.xcodeproj/project.pbxproj
+6 -6
View File
@@ -2293,7 +2293,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 52; CURRENT_PROJECT_VERSION = 54;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Z56Z6NYZN2; DEVELOPMENT_TEAM = Z56Z6NYZN2;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@@ -2331,7 +2331,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 52; CURRENT_PROJECT_VERSION = 54;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = Z56Z6NYZN2; DEVELOPMENT_TEAM = Z56Z6NYZN2;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@@ -2489,7 +2489,7 @@
"@executable_path/../../../../Frameworks", "@executable_path/../../../../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.0-beta.6; MARKETING_VERSION = 1.5.0-beta.11;
PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.system; PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.system;
PRODUCT_NAME = "$(inherited)"; PRODUCT_NAME = "$(inherited)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2525,7 +2525,7 @@
"@executable_path/../../../../Frameworks", "@executable_path/../../../../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.0-beta.6; MARKETING_VERSION = 1.5.0-beta.11;
PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.system; PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.system;
PRODUCT_NAME = "$(inherited)"; PRODUCT_NAME = "$(inherited)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2565,7 +2565,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.0-beta.6; MARKETING_VERSION = 1.5.0-beta.11;
PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.independent; PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.independent;
PRODUCT_NAME = SFM; PRODUCT_NAME = SFM;
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2604,7 +2604,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.0-beta.6; MARKETING_VERSION = 1.5.0-beta.11;
PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.independent; PRODUCT_BUNDLE_IDENTIFIER = io.nekohasekai.sfa.independent;
PRODUCT_NAME = SFM; PRODUCT_NAME = SFM;
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";