Merge pull request #416 from EbrahimTahernejad/patch-1

Make logger global
hiddify · Feb 5, 2024 · a631a98 · a631a98
2 parents 0ce01bf + faf6928
commit a631a98
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/ios/Runner/Handlers/LogsEventHandler.swift b/ios/Runner/Handlers/LogsEventHandler.swift
@@ -3,6 +3,7 @@ import Combine
 import Libcore
 
 class LogsEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler, LibboxCommandClientHandlerProtocol {
+    static let shared: LogsEventHandler = LogsEventHandler()
     static let name = "\(Bundle.main.serviceIdentifier)/service.logs"
 
     private var channel: FlutterEventChannel?
@@ -15,7 +16,7 @@ class LogsEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler, LibboxCom
     private var lock: NSLock = NSLock()
 
     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?.setStreamHandler(instance)
     }

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