Remove ignoreDeviceSleep && Improve delete button on macOS

This commit is contained in:
世界
2024-02-16 13:41:32 +08:00
parent 1f6e99f576
commit bbee434895
11 changed files with 72 additions and 36 deletions
-2
View File
@@ -12,7 +12,6 @@ public enum SharedPreferences {
public static let alwaysOn = Preference<Bool>("always_on", defaultValue: false)
public static let ignoreMemoryLimit = Preference<Bool>("ignore_memory_limit", defaultValue: ignoreMemoryLimitByDefault)
public static let ignoreDeviceSleep = Preference<Bool>("ignore_device_sleep", defaultValue: false)
#if os(iOS)
public static let excludeLocalNetworksByDefault = true
@@ -31,7 +30,6 @@ public enum SharedPreferences {
public static func resetPacketTunnel() async {
await ignoreMemoryLimit.set(nil)
await ignoreDeviceSleep.set(nil)
#if !os(tvOS)
await includeAllNetworks.set(nil)
await excludeAPNs.set(nil)
+1 -9
View File
@@ -6,7 +6,6 @@ open class ExtensionProvider: NEPacketTunnelProvider {
public var username: String? = nil
private var commandServer: LibboxCommandServer!
private var boxService: LibboxBoxService!
private var ignoreDeviceSleep = false
private var systemProxyAvailable = false
private var systemProxyEnabled = false
private var platformInterface: ExtensionPlatformInterface!
@@ -36,7 +35,6 @@ open class ExtensionProvider: NEPacketTunnelProvider {
}
await LibboxSetMemoryLimit(!SharedPreferences.ignoreMemoryLimit.get())
ignoreDeviceSleep = await SharedPreferences.ignoreDeviceSleep.get()
if platformInterface == nil {
platformInterface = ExtensionPlatformInterface(self)
@@ -161,18 +159,12 @@ open class ExtensionProvider: NEPacketTunnelProvider {
}
override open func sleep() async {
if ignoreDeviceSleep {
return
}
if let boxService {
boxService.sleep()
boxService.pause()
}
}
override open func wake() {
if ignoreDeviceSleep {
return
}
if let boxService {
boxService.wake()
}