From 236d072235f74eee191a4d23e6874e70b5b32a17 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Wed, 2 Apr 2025 13:03:04 +1100 Subject: [PATCH] Moved the 'LibSession.clearLoggers' call below suspending the network --- Session/Meta/SessionApp.swift | 2 +- Session/Settings/DeveloperSettingsViewModel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Session/Meta/SessionApp.swift b/Session/Meta/SessionApp.swift index f1cae8bea..bd7808a1a 100644 --- a/Session/Meta/SessionApp.swift +++ b/Session/Meta/SessionApp.swift @@ -139,7 +139,6 @@ public class SessionApp: SessionAppType { public func resetData(onReset: (() -> ())) { homeViewController = nil - LibSession.clearLoggers() dependencies.remove(cache: .libSession) dependencies.mutate(cache: .libSessionNetwork) { $0.clearSnodeCache() @@ -152,6 +151,7 @@ public class SessionApp: SessionAppType { try? dependencies[singleton: .keychain].removeAll() onReset() + LibSession.clearLoggers() Log.info("Data Reset Complete.") Log.flush() diff --git a/Session/Settings/DeveloperSettingsViewModel.swift b/Session/Settings/DeveloperSettingsViewModel.swift index 97164a5db..2c33abf6e 100644 --- a/Session/Settings/DeveloperSettingsViewModel.swift +++ b/Session/Settings/DeveloperSettingsViewModel.swift @@ -1362,12 +1362,12 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, } /// Need to shut everything down before the swap out the data to prevent crashes - LibSession.clearLoggers() dependencies[singleton: .jobRunner].stopAndClearPendingJobs() dependencies.remove(cache: .libSession) dependencies.mutate(cache: .libSessionNetwork) { $0.suspendNetworkAccess() } dependencies[singleton: .storage].suspendDatabaseAccess() try dependencies[singleton: .storage].closeDatabase() + LibSession.clearLoggers() let deleteEnumerator: FileManager.DirectoryEnumerator? = FileManager.default.enumerator( at: URL(