From: Claudio Cambra <claudio.cambra@gmail.com>
Date: Wed, 21 Sep 2022 17:15:35 +0000 (+0200)
Subject: Clicking on file name clash activities now opens file in web UI were the clash can... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~250^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=664a80cbb5c9327dd956f2aa74703277cee7659f;p=nextcloud-desktop.git

Clicking on file name clash activities now opens file in web UI were the clash can be resolved

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

diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index a840143a6..131a3dbc8 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()) {