Skip to content

Commit a631a98

Browse files
authored
Merge pull request #416 from EbrahimTahernejad/patch-1
Make logger global
2 parents 0ce01bf + faf6928 commit a631a98

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

ios/Runner/Handlers/LogsEventHandler.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Combine
33
import Libcore
44

55
class LogsEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler, LibboxCommandClientHandlerProtocol {
6+
static let shared: LogsEventHandler = LogsEventHandler()
67
static let name = "\(Bundle.main.serviceIdentifier)/service.logs"
78

89
private var channel: FlutterEventChannel?
@@ -15,7 +16,7 @@ class LogsEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler, LibboxCom
1516
private var lock: NSLock = NSLock()
1617

1718
public static func register(with registrar: FlutterPluginRegistrar) {
18-
let instance = LogsEventHandler()
19+
let instance = LogsEventHandler.shared
1920
instance.channel = FlutterEventChannel(name: Self.name, binaryMessenger: registrar.messenger())
2021
instance.channel?.setStreamHandler(instance)
2122
}

ios/Runner/VPN/VPNManager.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class VPNManager: ObservableObject {
8686
do {
8787
try await loadVPNPreference()
8888
} catch {
89-
LogsEventHandler().writeLog(error.localizedDescription)
89+
LogsEventHandler.shared.writeLog(error.localizedDescription)
9090
}
9191
}
9292

@@ -107,7 +107,7 @@ class VPNManager: ObservableObject {
107107
try await newManager.loadFromPreferences()
108108
self.manager = newManager
109109
} catch {
110-
LogsEventHandler().writeLog(error.localizedDescription)
110+
LogsEventHandler.shared.writeLog(error.localizedDescription)
111111
}
112112
}
113113

@@ -117,7 +117,7 @@ class VPNManager: ObservableObject {
117117
try await manager.saveToPreferences()
118118
try await manager.loadFromPreferences()
119119
} catch {
120-
LogsEventHandler().writeLog(error.localizedDescription)
120+
LogsEventHandler.shared.writeLog(error.localizedDescription)
121121
}
122122
}
123123

@@ -157,7 +157,7 @@ class VPNManager: ObservableObject {
157157
}
158158
try await self?.loadVPNPreference()
159159
} catch {
160-
LogsEventHandler().writeLog(error.localizedDescription)
160+
LogsEventHandler.shared.writeLog(error.localizedDescription)
161161
}
162162
}
163163
}.store(in: &cancelBag)
@@ -188,7 +188,7 @@ class VPNManager: ObservableObject {
188188
}
189189
}
190190
} catch {
191-
LogsEventHandler().writeLog(error.localizedDescription)
191+
LogsEventHandler.shared.writeLog(error.localizedDescription)
192192
}
193193
}
194194

@@ -202,7 +202,7 @@ class VPNManager: ObservableObject {
202202
"DisableMemoryLimit": (disableMemoryLimit ? "YES" : "NO") as NSString,
203203
])
204204
} catch {
205-
LogsEventHandler().writeLog(error.localizedDescription)
205+
LogsEventHandler.shared.writeLog(error.localizedDescription)
206206
}
207207
connectTime = .now
208208
}

0 commit comments

Comments
 (0)