vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Merge pull request #416 from EbrahimTahernejad/patch-1

Browse Source 
Make logger global
This commit is contained in:
Hiddify
2024-02-05 15:52:55 +01:00
committed by GitHub
parent 0ce01bf60d faf6928889
commit a631a9889d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ios/Runner/Handlers/LogsEventHandler.swift
View File

@@ -3,6 +3,7 @@ import Combine
import Libcore import Libcore
class LogsEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler, LibboxCommandClientHandlerProtocol { class LogsEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler, LibboxCommandClientHandlerProtocol {
static let shared: LogsEventHandler = LogsEventHandler()
static let name = "\(Bundle.main.serviceIdentifier)/service.logs" static let name = "\(Bundle.main.serviceIdentifier)/service.logs"
private var channel: FlutterEventChannel? private var channel: FlutterEventChannel?
@@ -15,7 +16,7 @@ class LogsEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler, LibboxCom
private var lock: NSLock = NSLock() private var lock: NSLock = NSLock()
public static func register(with registrar: FlutterPluginRegistrar) { public static func register(with registrar: FlutterPluginRegistrar) {
let instance = LogsEventHandler() let instance = LogsEventHandler.shared
instance.channel = FlutterEventChannel(name: Self.name, binaryMessenger: registrar.messenger()) instance.channel = FlutterEventChannel(name: Self.name, binaryMessenger: registrar.messenger())
instance.channel?.setStreamHandler(instance) instance.channel?.setStreamHandler(instance)
} }

12
ios/Runner/VPN/VPNManager.swift
View File

@@ -86,7 +86,7 @@ class VPNManager: ObservableObject {
do { do {
try await loadVPNPreference() try await loadVPNPreference()
} catch { } catch {
LogsEventHandler().writeLog(error.localizedDescription) LogsEventHandler.shared.writeLog(error.localizedDescription)
} }
} }
@@ -107,7 +107,7 @@ class VPNManager: ObservableObject {
try await newManager.loadFromPreferences() try await newManager.loadFromPreferences()
self.manager = newManager self.manager = newManager
} catch { } catch {
LogsEventHandler().writeLog(error.localizedDescription) LogsEventHandler.shared.writeLog(error.localizedDescription)
} }
} }
@@ -117,7 +117,7 @@ class VPNManager: ObservableObject {
try await manager.saveToPreferences() try await manager.saveToPreferences()
try await manager.loadFromPreferences() try await manager.loadFromPreferences()
} catch { } catch {
LogsEventHandler().writeLog(error.localizedDescription) LogsEventHandler.shared.writeLog(error.localizedDescription)
} }
} }
@@ -157,7 +157,7 @@ class VPNManager: ObservableObject {
} }
try await self?.loadVPNPreference() try await self?.loadVPNPreference()
} catch { } catch {
LogsEventHandler().writeLog(error.localizedDescription) LogsEventHandler.shared.writeLog(error.localizedDescription)
} }
} }
}.store(in: &cancelBag) }.store(in: &cancelBag)
@@ -188,7 +188,7 @@ class VPNManager: ObservableObject {
} }
} }
} catch { } catch {
LogsEventHandler().writeLog(error.localizedDescription) LogsEventHandler.shared.writeLog(error.localizedDescription)
} }
} }
@@ -202,7 +202,7 @@ class VPNManager: ObservableObject {
"DisableMemoryLimit": (disableMemoryLimit ? "YES" : "NO") as NSString, "DisableMemoryLimit": (disableMemoryLimit ? "YES" : "NO") as NSString,
]) ])
} catch { } catch {
LogsEventHandler().writeLog(error.localizedDescription) LogsEventHandler.shared.writeLog(error.localizedDescription)
} }
connectTime = .now connectTime = .now
} }