Fix path logic for sync activities.

Signed-off-by: alex-z <blackslayer4@gmail.com>
nextcloud · Sep 8, 2023 · 0129253 · 0129253
1 parent b3f9ff2
commit 0129253
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -1318,7 +1318,7 @@ QStringList FolderMan::findFileInLocalFolders(const QString &relPath, const Acco
         if (acc && folder->accountState()->account() != acc) {
             continue;
         }
-        if (!serverPath.startsWith(folder->remotePath()))
+        if (!serverPath.startsWith(folder->remotePathTrailingSlash()))
             continue;
 
         QString path = folder->cleanPath() + '/';

diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
@@ -156,7 +156,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
         if (!fileName.isEmpty()) {
             const auto folder = FolderMan::instance()->folder(a._folder);
 
-            const QString relPath = folder ? folder->remotePath() + fileName : fileName;
+            const QString relPath = folder ? folder->remotePathTrailingSlash() + fileName : fileName;
 
             const auto localFiles = FolderMan::instance()->findFileInLocalFolders(relPath, ast->account());
 
@@ -184,7 +184,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
         if (!a._file.isEmpty()) {
             const auto folder = FolderMan::instance()->folder(a._folder);
 
-            QString relPath = folder ? folder->remotePath() + a._file : a._file;
+            QString relPath = folder ? folder->remotePathTrailingSlash() + a._file : a._file;
 
             const auto localFiles = FolderMan::instance()->findFileInLocalFolders(relPath, ast->account());
 

diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
@@ -806,7 +806,7 @@ void User::processCompletedSyncItem(const Folder *folder, const SyncFileItemPtr
         }
 
         if(activity._fileAction != "file_deleted" && !item->isEmpty()) {
-            const auto localFiles = FolderMan::instance()->findFileInLocalFolders(item->_file, account());
+            const auto localFiles = FolderMan::instance()->findFileInLocalFolders(folder->remotePathTrailingSlash() + item->_file, account());
             if (!localFiles.isEmpty()) {
                 const auto firstFilePath = localFiles.constFirst();
                 const auto itemJournalRecord = item->toSyncJournalFileRecordWithInode(firstFilePath);