Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorClaudio Cambra <claudio.cambra@gmail.com>2022-09-21 20:15:35 +0300
committerClaudio Cambra <claudio.cambra@gmail.com>2022-09-26 13:10:38 +0300
commit664a80cbb5c9327dd956f2aa74703277cee7659f (patch)
treefd2cbe598a4f2befe67fd561b0776570117c102f /src
parent6fa2542a10926d6e6cde33b29a6ef524a5395f27 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/gui/tray/activitylistmodel.cpp16
1 files changed, 16 insertions, 0 deletions
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()) {