Just use davUser as account identifier for macOS log filename

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index f589fb3c59eaf6f71f40b198f096cd6d618a98bf..a1149190a8aeef05d0bcb99d2a9ff26f26422ebe 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -150,7 +150,13 @@ bool createDebugArchive(const QString &filename)
         const auto xpc = fileProvider->xpc();
         const auto vfsAccounts = OCC::Mac::FileProviderSettingsController::instance()->vfsEnabledAccounts();
         for (const auto &accountUserIdAtHost : vfsAccounts) {
-            const auto vfsLogFilename = QStringLiteral("macOS_vfs_%1.log").arg(accountUserIdAtHost);
+            const auto accountState = OCC::AccountManager::instance()->accountFromUserId(accountUserIdAtHost);
+            if (!accountState) {
+                qWarning() << "Could not find account for" << accountUserIdAtHost;
+                continue;
+            }
+            const auto account = accountState->account();
+            const auto vfsLogFilename = QStringLiteral("macOS_vfs_%1.log").arg(account->davUser());
             const auto vfsLogPath = tempDir.filePath(vfsLogFilename);
             xpc->createDebugArchiveForExtension(accountUserIdAtHost, vfsLogPath);
             zip.addLocalFile(vfsLogPath, vfsLogFilename);