feature(file-provider): Open folder tray window header button

src/gui/macOS/fileproviderdomainmanager.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
 #include <QObject>
 #include <QList>
 
 #include "accountstate.h"
@@ -73,6 +73,12 @@
      */
     [[nodiscard]] QString userVisibleUrlForDomainIdentifier(const QString &domainIdentifier) const;
 
+    /**
+     * @brief Open the system file viewer at the root container of a file provider domain.
+     * @param domainIdentifier The identifier of the file provider domain.
+     */
+    void openFileViewerForDomainIdentifier(const QString &domainIdentifier) const;
+
 public slots:
     /**
      * @brief Handle file ID changes from push notifications

src/gui/macOS/fileproviderdomainmanager.mm

@@ -5,6 +5,7 @@
 
 #include "configfile.h"
 
+#import <AppKit/AppKit.h>
 #import <FileProvider/FileProvider.h>
 
 #include <QDir>
@@ -540,6 +541,17 @@ void removeFileProviderDomainData(NSString * const domainIdentifier)
     return {};
 }
 
+void FileProviderDomainManager::openFileViewerForDomainIdentifier(const QString &domainIdentifier) const
+{
+    const auto url = userVisibleUrlForDomainIdentifier(domainIdentifier);
+
+    if (url.isEmpty()) {
+        return;
+    }
+
+    [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[[NSURL fileURLWithPath:url.toNSString()]]];
+}
+
 void FileProviderDomainManager::slotHandleFileIdsChanged(const OCC::Account * const account, const QList<qint64> &fileIds)
 {
     // NOTE: The fileIds argument is ignored for now but retained in the signature for future use.

src/gui/tray/TrayFoldersMenuButton.qml

@@ -36,7 +36,7 @@ HeaderButton {
         }
     }
 
-    visible: currentUser.hasLocalFolder
+    visible: currentUser.hasLocalFolder || (Qt.platform.os === "osx" && currentUser.hasFileProvider)
     display: AbstractButton.IconOnly
     flat: true
 

src/gui/tray/TrayWindowHeader.qml

@@ -56,17 +56,33 @@ Rectangle {
             Layout.preferredWidth:  Style.trayWindowHeaderHeight
             Layout.fillHeight: true
 
-            visible: currentUser.hasLocalFolder
+            visible: currentUser.hasLocalFolder || (Qt.platform.os === "osx" && currentUser.hasFileProvider)
             currentUser: UserModel.currentUser
             parentBackgroundColor: root.color
 
-            onClicked: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder()
+            onClicked: {
+                if (openLocalFolderButton.userHasGroupFolders) {
+                    openLocalFolderButton.toggleMenuOpen()
+                } else if (currentUser.hasLocalFolder) {
+                    UserModel.openCurrentAccountLocalFolder()
+                } else if (Qt.platform.os === "osx") {
+                    UserModel.openCurrentAccountFileProviderDomain()
+                }
+            }
 
             onFolderEntryTriggered: isGroupFolder ? UserModel.openCurrentAccountFolderFromTrayInfo(fullFolderPath) : UserModel.openCurrentAccountLocalFolder()
 
             Accessible.role: Accessible.Graphic
             Accessible.name: qsTr("Open local or group folders")
-            Accessible.onPressAction: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder() 
+            Accessible.onPressAction: {
+                if (openLocalFolderButton.userHasGroupFolders) {
+                    openLocalFolderButton.toggleMenuOpen()
+                } else if (currentUser.hasLocalFolder) {
+                    UserModel.openCurrentAccountLocalFolder()
+                } else if (Qt.platform.os === "osx") {
+                    UserModel.openCurrentAccountFileProviderDomain()
+                }
+            }
         }
 
         HeaderButton {

src/gui/tray/usermodel.cpp

@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "notificationhandler.h"
 #include "usermodel.h"
@@ -117,7 +117,7 @@
         if (nestedOutput.isObject()) {
             const auto nestedObject = nestedOutput.toObject();
             const auto textValue = nestedObject.value("text"_L1);
             if (textValue.isString()) {
                 return textValue.toString();
             }
             const auto answerValue = nestedObject.value("answer"_L1);
@@ -127,7 +127,7 @@
         }
 
         const auto textValue = outputObject.value("text"_L1);
         if (textValue.isString()) {
             return textValue.toString();
         }
         const auto answerValue = outputObject.value("answer"_L1);
@@ -176,7 +176,7 @@
 
         const auto state = determineSyncStatus(folder->syncResult());
 
         switch (state) {
         case OCC::SyncResult::Error:
         case OCC::SyncResult::SetupError:
             hasError = true;
@@ -217,7 +217,7 @@
 
 bool isSyncStatusError(const OCC::SyncResult::Status status)
 {
     switch (status) {
     case OCC::SyncResult::Error:
     case OCC::SyncResult::SetupError:
     case OCC::SyncResult::Problem:
@@ -274,7 +274,7 @@
         this, &User::slotCheckExpiredActivities);
 
     connect(_account.data(), &AccountState::stateChanged,
             [=, this]() { if (isConnected()) {slotRefreshImmediately();} });
     connect(_account.data(), &AccountState::stateChanged, this, &User::accountStateChanged);
     connect(_account.data(), &AccountState::hasFetchedNavigationApps,
         this, &User::slotRebuildNavigationAppList);
@@ -322,7 +322,7 @@
     connect(&_assistantPollTimer, &QTimer::timeout, this, &User::slotAssistantPoll);
 
     const auto folderMan = FolderMan::instance();
     connect(folderMan, &FolderMan::folderSyncStateChange, this, [this](const Folder *folder) {
         if (!folder || folder->accountState() == _account.data()) {
             updateSyncStatus();
         }
@@ -384,7 +384,7 @@
 
 void User::showDesktopNotification(const ActivityList &activityList)
 {
     const auto subject = tr("%n notification(s)", nullptr, activityList.count());
     const auto notificationId = -static_cast<int>(qHash(subject));
 
     if (!canShowNotification(notificationId)) {
@@ -439,7 +439,7 @@
 
     _activityModel->removeOutdatedNotifications(list);
 
     std::copy_if(list.constBegin(), list.constEnd(), std::back_inserter(toNotifyList), [&](const Activity &activity) -> bool {
         if (!activity._shouldNotify) {
             qCDebug(lcActivity).nospace() << "No notification should be sent for activity with id=" << activity._id << " objectType=" << activity._objectType;
             return false;
@@ -537,7 +537,7 @@
     setNotificationRefreshInterval(ConfigFile().notificationRefreshInterval());
 }
 
 void User::slotReceivedPushFilesChanges(Account *account)
 {
     if (account->id() != _account->account()->id()) {
         return;
@@ -555,7 +555,7 @@
 #endif
 }
 
 void User::slotReceivedPushFileIdsChanges(Account *account, const QList<qint64> &fileIds)
 {
     if (account->id() != _account->account()->id()) {
         return;
@@ -1074,7 +1074,7 @@
         if(activity._fileAction != "file_deleted" && !item->isEmpty()) {
             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);
 
                 if(!itemJournalRecord.isVirtualFile()) {
@@ -1199,6 +1199,21 @@
     }
 }
 
+#ifdef BUILD_FILE_PROVIDER_MODULE
+void User::openFileProviderDomain() const
+{
+    const auto domainIdentifier = _account->account()->fileProviderDomainIdentifier();
+    if (domainIdentifier.isEmpty()) {
+        return;
+    }
+    const auto domainManager = Mac::FileProvider::instance()->domainManager();
+    if (!domainManager) {
+        return;
+    }
+    domainManager->openFileViewerForDomainIdentifier(domainIdentifier);
+}
+#endif
+
 void User::openFolderLocallyOrInBrowser(const QString &fullRemotePath)
 {
     const auto folder = getFolder();
@@ -1337,6 +1352,13 @@
     return getFolder() != nullptr;
 }
 
+#ifdef BUILD_FILE_PROVIDER_MODULE
+bool User::hasFileProvider() const
+{
+    return !_account->account()->fileProviderDomainIdentifier().isEmpty();
+}
+#endif
+
 bool User::serverHasTalk() const
 {
     return talkApp() != nullptr;
@@ -1587,7 +1609,7 @@
     _assistantConnector->fetchTasks(_assistantTaskType);
 }
 
 void User::slotAssistantTaskTypesFetched(const QJsonDocument &json, int statusCode)
 {
     if (statusCode < assistantSuccessMinStatusCode || statusCode >= assistantSuccessMaxStatusCode) {
         slotAssistantRequestError(QStringLiteral("taskTypes"), statusCode);
@@ -1622,7 +1644,7 @@
     _assistantConnector->scheduleTask(_assistantQuestion, _assistantTaskType, history);
 }
 
 void User::slotAssistantTasksFetched(const QJsonDocument &json, int statusCode)
 {
     if (statusCode < assistantSuccessMinStatusCode || statusCode >= assistantSuccessMaxStatusCode) {
         slotAssistantRequestError(QStringLiteral("tasks"), statusCode);
@@ -1670,7 +1692,7 @@
     }
 }
 
 void User::slotAssistantTaskScheduled(const QJsonDocument &json, int statusCode)
 {
     if (statusCode < assistantSuccessMinStatusCode || statusCode >= assistantSuccessMaxStatusCode) {
         slotAssistantRequestError(QStringLiteral("schedule"), statusCode);
@@ -1687,7 +1709,7 @@
     }
 }
 
 void User::slotAssistantTaskDeleted(int statusCode)
 {
     if (statusCode >= assistantSuccessMinStatusCode && statusCode < assistantSuccessMaxStatusCode) {
         return;
@@ -1695,7 +1717,7 @@
     slotAssistantRequestError(QStringLiteral("deleteTask"), statusCode);
 }
 
 void User::slotAssistantRequestError(const QString &context, int statusCode)
 {
     _assistantPollTimer.stop();
     _assistantRequestInProgress = false;
@@ -1747,7 +1769,7 @@
         return;
     }
 
     int64_t total = usedBytes + availableBytes;
     if (total <= 0 || !ConfigFile().showQuotaWarningNotifications()) {
         return;
     }
@@ -1823,11 +1845,11 @@
         const auto mountPoint = groupFolderInfo.value(QStringLiteral("mount_point"), {}).toString();
         parseNewGroupFolderPath(mountPoint);
     }
     std::sort(std::begin(_trayFolderInfos), std::end(_trayFolderInfos), [](const auto &leftVariant, const auto &rightVariant) {
         const auto folderInfoA = leftVariant.template value<TrayFolderInfo>();
         const auto folderInfoB = rightVariant.template value<TrayFolderInfo>();
         return folderInfoA._fullPath < folderInfoB._fullPath;
     });
 
     if (!_trayFolderInfos.isEmpty()) {
         if (hasLocalFolder()) {
@@ -1865,7 +1887,7 @@
     : QAbstractListModel(parent)
 {
     if (AccountManager::instance()->accounts().size() > 0) {
         setInitialUser();
     }
 
     const auto folderMan = FolderMan::instance();
@@ -1907,7 +1929,7 @@
     buildUserList();
 
     if(!_users.isEmpty()) {
         ConfigFile cfg;
         const uint lastSelectedAccountId = cfg.lastSelectedAccount();
 
         for (int i = 0; i <  _users.size(); i++) {
@@ -1926,7 +1948,7 @@
 
 int UserModel::numUsers()
 {
     return _users.size();
 }
 
 int UserModel::currentUserId() const
@@ -1949,7 +1971,7 @@
 
 int UserModel::syncErrorUserCount() const
 {
     return _syncErrorUserIds.size();
 }
 
 int UserModel::firstSyncErrorUserId() const
@@ -1969,9 +1991,9 @@
 
 QImage UserModel::avatarById(const int id) const
 {
     const auto foundUserByIdIter = std::find_if(std::cbegin(_users), std::cend(_users), [&id](const OCC::User* const user) {
         return user->account()->id() == QString::number(id);
     });
 
     if (foundUserByIdIter == std::cend(_users)) {
         return {};
@@ -2031,7 +2053,7 @@
 
         _users << u;
         if (isCurrent || (_currentUserId < 0 && !_init)) {
             setCurrentUserId(_users.size() - 1);
         }
 
         endInsertRows();
@@ -2056,6 +2078,16 @@
     _users[_currentUserId]->openLocalFolder();
 }
 
+#ifdef BUILD_FILE_PROVIDER_MODULE
+void UserModel::openCurrentAccountFileProviderDomain()
+{
+    if (_currentUserId < 0 || _currentUserId >= _users.size())
+        return;
+
+    _users[_currentUserId]->openFileProviderDomain();
+}
+#endif
+
 void UserModel::openCurrentAccountServer()
 {
     if (_currentUserId < 0 || _currentUserId >= _users.size())
@@ -2078,7 +2110,7 @@
     _users[_currentUserId]->openFolderLocallyOrInBrowser(fullRemotePath);
 }
 
 void UserModel::openCurrentAccountFeaturedApp()
 {
     if (!currentUser()) {
         return;
@@ -2174,7 +2206,7 @@
     endRemoveRows();
 
     if (_users.size() <= 1) {
         setCurrentUserId(_users.size() - 1);
     } else if (currentUserId() > id) {
         // an account was removed from the in-between 0 and the current one, the index of the current one needs a decrement
         setCurrentUserId(currentUserId() - 1);
@@ -2197,13 +2229,13 @@
 int UserModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return _users.count();
 }
 
 QVariant UserModel::data(const QModelIndex &index, int role) const
 {
     auto result = QVariant{};
     switch (static_cast<UserRoles>(role))
     {
     case NameRole:
         result = _users[index.row()]->name();
@@ -2316,9 +2348,9 @@
 {
     Q_ASSERT(account);
 
     const auto it = std::find_if(_users.cbegin(), _users.cend(), [account](const User *user) {
         return user->account()->id() == account->account()->id();
     });
 
     if (it == _users.cend()) {
         return nullptr;
@@ -2329,9 +2361,9 @@
 
 int UserModel::findUserIdForAccount(AccountState *account) const
 {
     const auto it = std::find_if(std::cbegin(_users), std::cend(_users), [=](const User *user) {
         return user->account()->id() == account->account()->id();
     });
 
     if (it == std::cend(_users)) {
         return -1;
@@ -2341,7 +2373,7 @@
     return id;
 }
 
 bool UserModel::userHasSyncErrors(const User *user) const
 {
     if (!user) {
         return false;
@@ -2352,7 +2384,7 @@
         return false;
     }
 
     for (const auto folder : FolderMan::instance()->map().values()) {
         if (folder->accountState() != accountState.data()) {
             continue;
         }
@@ -2394,7 +2426,7 @@
 class ImageResponse : public QQuickImageResponse
 {
 public:
     ImageResponse(const QString &id, const QSize &requestedSize, QThreadPool *pool)
     {
         Q_UNUSED(pool)
 
@@ -2419,8 +2451,8 @@
             // Format is "image://avatars/user-id=avatar-requested-user/local-user-id:0"
             const auto userIdsString = id.split('=');
             const auto userIds = userIdsString.last().split("/local-account:");
             const auto avatarUserId = userIds.first();
             const auto accountString = userIds.last();
             const auto accountState = AccountManager::instance()->account(accountString);
             Q_ASSERT(accountState);
             Q_ASSERT(accountState->account());
@@ -2434,8 +2466,8 @@
 
             QMetaObject::invokeMethod(qnam, [this, requestedSize, avatarUserId, account]() {
                 const auto avatarSize = requestedSize.width() > 0 ? requestedSize.width() : 64;
                 const auto avatarJob = new AvatarJob(account, avatarUserId, avatarSize);
                 connect(avatarJob, &AvatarJob::avatarPixmap, this, [&](const QImage &avatarImg) {
                     QMetaObject::invokeMethod(this, [this, avatarImg] {
                         handleDone(AvatarJob::makeCircularAvatar(avatarImg));
                     });
@@ -2518,7 +2550,7 @@
 int UserAppsModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return _apps.count();
 }
 
 QVariant UserAppsModel::data(const QModelIndex &index, int role) const

src/gui/tray/usermodel.h

@@ -1,12 +1,12 @@
 /*
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef USERMODEL_H
 #define USERMODEL_H
 
 #include <QAbstractListModel>
 #include <QImage>
 #include <QDateTime>
 #include <QJsonDocument>
@@ -53,7 +53,7 @@
     FolderType _folderType = Folder;
 };
 
 class User : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
@@ -68,6 +68,9 @@
     Q_PROPERTY(QString statusMessage READ statusMessage NOTIFY statusChanged)
     Q_PROPERTY(bool desktopNotificationsAllowed READ isDesktopNotificationsAllowed NOTIFY desktopNotificationsAllowedChanged)
     Q_PROPERTY(bool hasLocalFolder READ hasLocalFolder NOTIFY hasLocalFolderChanged)
+#ifdef BUILD_FILE_PROVIDER_MODULE
+    Q_PROPERTY(bool hasFileProvider READ hasFileProvider NOTIFY accountStateChanged)
+#endif
     Q_PROPERTY(bool isFeaturedAppEnabled READ isFeaturedAppEnabled NOTIFY featuredAppChanged)
     Q_PROPERTY(QString featuredAppIcon READ featuredAppIcon NOTIFY featuredAppChanged)
     Q_PROPERTY(QString featuredAppAccessibleName READ featuredAppAccessibleName NOTIFY featuredAppChanged)
@@ -87,7 +90,7 @@
     Q_PROPERTY(bool assistantRequestInProgress READ assistantRequestInProgress NOTIFY assistantRequestInProgressChanged)
 
 public:
     User(AccountStatePtr &account, const bool &isCurrent = false, QObject *parent = nullptr);
 
     [[nodiscard]] AccountPtr account() const;
     [[nodiscard]] AccountStatePtr accountState() const;
@@ -100,10 +103,16 @@
     ActivityListModel *getActivityModel();
     [[nodiscard]] UnifiedSearchResultsListModel *getUnifiedSearchResultsListModel() const;
     void openLocalFolder() const;
+#ifdef BUILD_FILE_PROVIDER_MODULE
+    void openFileProviderDomain() const;
+#endif
     void openFolderLocallyOrInBrowser(const QString &fullRemotePath);
     [[nodiscard]] QString name() const;
     [[nodiscard]] QString server(bool shortened = true) const;
     [[nodiscard]] bool hasLocalFolder() const;
+#ifdef BUILD_FILE_PROVIDER_MODULE
+    [[nodiscard]] bool hasFileProvider() const;
+#endif
     [[nodiscard]] bool isFeaturedAppEnabled() const;
     [[nodiscard]] QString featuredAppIcon() const;
     [[nodiscard]] QString featuredAppAccessibleName() const;
@@ -159,7 +168,7 @@
     void assistantResponseChanged();
     void assistantErrorChanged();
     void assistantMessagesChanged();
     void assistantRequestInProgressChanged();
 
 public slots:
     void slotItemCompleted(const QString &folder, const OCC::SyncFileItemPtr &item);
@@ -245,7 +254,7 @@
     // no query for notifications is started.
     int _notificationRequestsRunning = 0;
 
     int _lastTalkNotificationsReceivedCount = 0;
 
     bool _isNotificationFetchRunning = false;
 
@@ -338,6 +347,9 @@
 public slots:
     void fetchCurrentActivityModel();
     void openCurrentAccountLocalFolder();
+#ifdef BUILD_FILE_PROVIDER_MODULE
+    void openCurrentAccountFileProviderDomain();
+#endif
     void openCurrentAccountServer();
     void openCurrentAccountFolderFromTrayInfo(const QString &fullRemotePath);
     void openCurrentAccountFeaturedApp();