From 664a80cbb5c9327dd956f2aa74703277cee7659f Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 21 Sep 2022 19:15:35 +0200 Subject: [PATCH] Clicking on file name clash activities now opens file in web UI were the clash can be resolved Signed-off-by: Claudio Cambra --- src/gui/tray/activitylistmodel.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp index a840143a68..131a3dbc86 100644 --- a/src/gui/tray/activitylistmodel.cpp +++ b/src/gui/tray/activitylistmodel.cpp @@ -811,6 +811,22 @@ void ActivityListModel::slotTriggerDefaultAction(const int activityIndex) _currentInvalidFilenameDialog->open(); ownCloudGui::raiseDialog(_currentInvalidFilenameDialog); return; + } else if (activity._status == SyncFileItem::FileNameClash) { + const auto folder = FolderMan::instance()->folder(activity._folder); + const auto relPath = activity._fileAction == QStringLiteral("file_renamed") ? activity._renamedFile : activity._file; + SyncJournalFileRecord record; + + if (!folder || !folder->journalDb()->getFileRecord(relPath, &record)) { + return; + } + + fetchPrivateLinkUrl(folder->accountState()->account(), + relPath, + record.numericFileId(), + this, + [](const QString &link) { Utility::openBrowser(link); } + ); + return; } if (!path.isEmpty()) {