From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 31 Jan 2023 12:03:52 +0000 (+0100)
Subject: Fix displaying of file details button for local syncfileitem activities
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~18^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=824686d895049d265c6b0bb6bb68e8c96de9fc17;p=nextcloud-desktop.git

Fix displaying of file details button for local syncfileitem activities

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

diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index e41b88b03..6b6b4569c 100644
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -341,11 +341,11 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
     case DisplayActions:
         return _displayActions;
     case ShowFileDetailsRole:
-        return !data(index, PathRole).toString().isEmpty() &&
+        return _displayActions &&
                 a._objectType == QStringLiteral("files") &&
-                _displayActions &&
                 a._fileAction != "file_deleted" &&
-                a._syncFileItemStatus != SyncFileItem::FileIgnored;
+                a._syncFileItemStatus != SyncFileItem::FileIgnored &&
+                !data(index, OpenablePathRole).toString().isEmpty();
     case DismissableRole:
         // Do not allow dismissal of things requiring user input regarding syncing
         return !a._links.isEmpty() &&
diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index cc702e114..a26a054cd 100644
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -658,6 +658,7 @@ void User::processCompletedSyncItem(const Folder *folder, const SyncFileItemPtr
 
     Activity activity;
     activity._type = Activity::SyncFileItemType; //client activity
+    activity._objectType = QStringLiteral("files");
     activity._syncFileItemStatus = item->_status;
     activity._dateTime = QDateTime::currentDateTime();
     activity._message = item->_originalFile;