feat(tray): sync status overlay for accounts menu

src/gui/tray/UserLine.qml

@@ -28,20 +28,45 @@ AbstractButton {
         id: userLineLayout
         spacing: Style.userLineSpacing
 
-        Image {
-            id: accountAvatar
-            Layout.leftMargin: Style.accountIconsMenuMargin
-            verticalAlignment: Qt.AlignCenter
-            cache: false
-            source: model.avatar !== "" ? model.avatar : Style.darkMode ? "image://avatars/fallbackWhite" : "image://avatars/fallbackBlack"
-            Layout.preferredHeight: Style.accountAvatarSize
-            Layout.preferredWidth: Style.accountAvatarSize
-
-            Rectangle {
-                id: accountStatusIndicatorBackground
-                visible: model.isConnected && model.serverHasUserStatus
-                width: accountStatusIndicator.sourceSize.width + Style.trayFolderStatusIndicatorSizeOffset
-                height: width
+        Image {
+            id: accountAvatar
+            Layout.leftMargin: Style.accountIconsMenuMargin
+            verticalAlignment: Qt.AlignCenter
+            cache: false
+            source: model.avatar !== "" ? model.avatar : Style.darkMode ? "image://avatars/fallbackWhite" : "image://avatars/fallbackBlack"
+            Layout.preferredHeight: Style.accountAvatarSize
+            Layout.preferredWidth: Style.accountAvatarSize
+
+            Rectangle {
+                id: syncStatusIndicatorBackground
+                visible: !model.syncStatusOk
+                width: syncStatusIndicator.sourceSize.width + Style.trayFolderStatusIndicatorSizeOffset
+                height: width
+                color: "white"
+                anchors.top: accountAvatar.top
+                anchors.left: accountAvatar.left
+                radius: width * Style.trayFolderStatusIndicatorRadiusFactor
+            }
+
+            Image {
+                id: syncStatusIndicator
+                visible: !model.syncStatusOk
+                source: model.syncStatusIcon
+                cache: false
+                x: syncStatusIndicatorBackground.x + Style.trayFolderStatusIndicatorSizeOffset / 2
+                y: syncStatusIndicatorBackground.y + Style.trayFolderStatusIndicatorSizeOffset / 2
+                sourceSize.width: Style.accountAvatarStateIndicatorSize
+                sourceSize.height: Style.accountAvatarStateIndicatorSize
+
+                Accessible.role: Accessible.Indicator
+                Accessible.name: qsTr("Account sync status requires attention")
+            }
+
+            Rectangle {
+                id: accountStatusIndicatorBackground
+                visible: model.isConnected && model.serverHasUserStatus
+                width: accountStatusIndicator.sourceSize.width + Style.trayFolderStatusIndicatorSizeOffset
+                height: width
                 color: "white"
                 anchors.bottom: accountAvatar.bottom
                 anchors.right: accountAvatar.right

src/gui/tray/usermodel.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -17,6 +17,7 @@
 #include "notificationconfirmjob.h"
 #include "logger.h"
 #include "guiutility.h"
+#include "syncresult.h"
 #include "syncfileitem.h"
 #include "systray.h"
 #include "tray/activitylistmodel.h"
@@ -33,6 +34,7 @@
 #include <QPainter>
 #include <QPushButton>
 #include <QDateTime>
+#include <theme.h>
 
 // time span in milliseconds which has to be between two
 // refreshes of the notifications
@@ -41,6 +43,82 @@
 namespace {
 constexpr qint64 expiredActivitiesCheckIntervalMsecs = 1000 * 60;
 constexpr qint64 activityDefaultExpirationTimeMsecs = 1000 * 60 * 10;
+
+struct SyncStatusInfo {
+    QUrl icon;
+    bool ok = true;
+};
+
+OCC::SyncResult::Status determineSyncStatus(const OCC::SyncResult &syncResult)
+{
+    const auto status = syncResult.status();
+
+    if (status == OCC::SyncResult::Success || status == OCC::SyncResult::Problem) {
+        if (syncResult.hasUnresolvedConflicts()) {
+            return OCC::SyncResult::Problem;
+        }
+        return OCC::SyncResult::Success;
+    } else if (status == OCC::SyncResult::SyncPrepare || status == OCC::SyncResult::Undefined) {
+        return OCC::SyncResult::SyncRunning;
+    }
+    return status;
+}
+
+SyncStatusInfo syncStatusForAccount(const OCC::AccountStatePtr &accountState)
+{
+    if (!accountState || !accountState->isConnected()) {
+        return {OCC::Theme::instance()->offline(), false};
+    }
+
+    bool hasError = false;
+    bool hasWarning = false;
+    bool hasPaused = false;
+    bool hasSyncing = false;
+    for (const auto &folder : OCC::FolderMan::instance()->map()) {
+        if (!folder || folder->accountState() != accountState.data()) {
+            continue;
+        }
+
+        const auto state = determineSyncStatus(folder->syncResult());
+
+        switch (state) {
+        case OCC::SyncResult::Error:
+        case OCC::SyncResult::SetupError:
+            hasError = true;
+            break;
+        case OCC::SyncResult::Problem:
+        case OCC::SyncResult::Undefined:
+            hasWarning = true;
+            break;
+        case OCC::SyncResult::Paused:
+        case OCC::SyncResult::SyncAbortRequested:
+            hasPaused = true;
+            break;
+        case OCC::SyncResult::SyncRunning:
+        case OCC::SyncResult::NotYetStarted:
+            hasSyncing = true;
+            break;
+        case OCC::SyncResult::Success:
+        case OCC::SyncResult::SyncPrepare:
+            break;
+        }
+    }
+
+    if (hasError) {
+        return {OCC::Theme::instance()->error(), false};
+    }
+    if (hasWarning) {
+        return {OCC::Theme::instance()->warning(), false};
+    }
+    if (hasPaused) {
+        return {OCC::Theme::instance()->pause(), false};
+    }
+    if (hasSyncing) {
+        return {OCC::Theme::instance()->sync(), false};
+    }
+
+    return {OCC::Theme::instance()->ok(), true};
+}
 }
 
 namespace OCC {
@@ -122,6 +200,18 @@
             showDesktopNotification(certificateNeedMigration);
         }
     });
+
+    const auto folderMan = FolderMan::instance();
+    connect(folderMan, &FolderMan::folderSyncStateChange, this, [this](const Folder *folder) {
+        if (!folder || folder->accountState() == _account.data()) {
+            updateSyncStatus();
+        }
+    });
+    connect(folderMan, &FolderMan::folderListChanged, this, [this](const Folder::Map &) {
+        updateSyncStatus();
+    });
+    connect(_account.data(), &AccountState::isConnectedChanged, this, &User::updateSyncStatus);
+    updateSyncStatus();
 }
 
 void User::checkNotifiedNotifications()
@@ -1041,6 +1131,28 @@
     return _account->account()->userStatusConnector()->userStatus().icon();
 }
 
+QUrl User::syncStatusIcon() const
+{
+    return _syncStatusIcon;
+}
+
+bool User::syncStatusOk() const
+{
+    return _syncStatusOk;
+}
+
+void User::updateSyncStatus()
+{
+    const auto info = syncStatusForAccount(_account);
+    if (_syncStatusIcon == info.icon && _syncStatusOk == info.ok) {
+        return;
+    }
+
+    _syncStatusIcon = info.icon;
+    _syncStatusOk = info.ok;
+    emit syncStatusChanged();
+}
+
 bool User::serverHasUserStatus() const
 {
     return _account->account()->capabilities().userStatus();
@@ -1445,6 +1557,11 @@
             emit dataChanged(index(row, 0), index(row, 0), { UserModel::IsConnectedRole });
         });
 
+        connect(u, &User::syncStatusChanged, this, [this, row] {
+            emit dataChanged(index(row, 0), index(row, 0), { UserModel::SyncStatusIconRole,
+                                                            UserModel::SyncStatusOkRole });
+        });
+
         _users << u;
         if (isCurrent || (_currentUserId < 0 && !_init)) {
             setCurrentUserId(_users.size() - 1);
@@ -1620,7 +1737,7 @@
     auto result = QVariant{};
     switch (static_cast<UserRoles>(role))
     {
     case NameRole:
         result = _users[index.row()]->name();
         break;
     case ServerRole:
@@ -1662,6 +1779,12 @@
     case RemoveAccountTextRole:
         result = _users[index.row()]->isPublicShareLink() ? tr("Leave share") : tr("Remove account");
         break;
+    case SyncStatusIconRole:
+        result = _users[index.row()]->syncStatusIcon();
+        break;
+    case SyncStatusOkRole:
+        result = _users[index.row()]->syncStatusOk();
+        break;
     }
 
     return result;
@@ -1684,6 +1807,8 @@
     roles[IdRole] = "id";
     roles[CanLogoutRole] = "canLogout";
     roles[RemoveAccountTextRole] = "removeAccountText";
+    roles[SyncStatusIconRole] = "syncStatusIcon";
+    roles[SyncStatusOkRole] = "syncStatusOk";
     return roles;
 }
 
@@ -1904,4 +2029,3 @@
     return roles;
 }
 }
-

src/gui/tray/usermodel.h

@@ -6,7 +6,7 @@
 #ifndef USERMODEL_H
 #define USERMODEL_H
 
 #include <QAbstractListModel>
 #include <QImage>
 #include <QDateTime>
 #include <QStringList>
@@ -67,6 +67,8 @@
     Q_PROPERTY(QString featuredAppIcon READ featuredAppIcon NOTIFY featuredAppChanged)
     Q_PROPERTY(QString featuredAppAccessibleName READ featuredAppAccessibleName NOTIFY featuredAppChanged)
     Q_PROPERTY(QString avatar READ avatarUrl NOTIFY avatarChanged)
+    Q_PROPERTY(QUrl syncStatusIcon READ syncStatusIcon NOTIFY syncStatusChanged)
+    Q_PROPERTY(bool syncStatusOk READ syncStatusOk NOTIFY syncStatusChanged)
     Q_PROPERTY(bool isConnected READ isConnected NOTIFY accountStateChanged)
     Q_PROPERTY(bool needsToSignTermsOfService READ needsToSignTermsOfService NOTIFY accountStateChanged)
     Q_PROPERTY(UnifiedSearchResultsListModel* unifiedSearchResultsListModel READ getUnifiedSearchResultsListModel CONSTANT)
@@ -112,6 +114,8 @@
     [[nodiscard]] QString statusMessage() const;
     [[nodiscard]] QUrl statusIcon() const;
     [[nodiscard]] QString statusEmoji() const;
+    [[nodiscard]] QUrl syncStatusIcon() const;
+    [[nodiscard]] bool syncStatusOk() const;
     void processCompletedSyncItem(const Folder *folder, const SyncFileItemPtr &item);
     [[nodiscard]] const QVariantList &groupFolders() const;
     [[nodiscard]] bool canLogout() const;
@@ -128,6 +132,7 @@
     void headerColorChanged();
     void headerTextColorChanged();
     void accentColorChanged();
+    void syncStatusChanged();
     void sendReplyMessage(const int activityIndex, const QString &conversationToken, const QString &message, const QString &replyTo);
     void groupFoldersChanged();
 
@@ -180,6 +185,7 @@
 
     bool isActivityOfCurrentAccount(const Folder *folder) const;
     [[nodiscard]] bool isUnsolvableConflict(const SyncFileItemPtr &item) const;
+    void updateSyncStatus();
 
     bool notificationAlreadyShown(const qint64 notificationId);
     bool canShowNotification(const qint64 notificationId);
@@ -213,6 +219,8 @@
     // used for quota warnings
     int _lastQuotaPercent = 0;
     Activity _lastQuotaActivity;
+    QUrl _syncStatusIcon;
+    bool _syncStatusOk = true;
 };
 
 class UserModel : public QAbstractListModel
@@ -262,6 +270,8 @@
         IdRole,
         CanLogoutRole,
         RemoveAccountTextRole,
+        SyncStatusIconRole,
+        SyncStatusOkRole,
     };
 
     [[nodiscard]] AccountAppList appList() const;