Improved error message.

Signed-off-by: allexzander <blackslayer4@gmail.com>
nextcloud · Jun 14, 2021 · 6b590be · 6b590be
1 parent f205d77
commit 6b590be
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
@@ -24,6 +24,10 @@
 // refreshes of the notifications
 #define NOTIFICATION_REQUEST_FREE_PERIOD 15000
 
+namespace {
+    constexpr qint64 expiredActivitiesCheckIntervalMs = 1000 * 60;
+}
+
 namespace OCC {
 
 User::User(AccountStatePtr &account, const bool &isCurrent, QObject *parent)
@@ -45,6 +49,9 @@ User::User(AccountStatePtr &account, const bool &isCurrent, QObject *parent)
     connect(&_notificationCheckTimer, &QTimer::timeout,
         this, &User::slotRefresh);
 
+    connect(&_expiredActivitiesCheckTimer, &QTimer::timeout,
+        this, &User::slotCheckExpiredActivities);
+
     connect(_account.data(), &AccountState::stateChanged,
             [=]() { if (isConnected()) {slotRefreshImmediately();} });
     connect(_account.data(), &AccountState::stateChanged, this, &User::accountStateChanged);
@@ -147,6 +154,19 @@ void User::slotReceivedPushActivity(Account *account)
     }
 }
 
+void User::slotCheckExpiredActivities()
+{
+    for (const Activity &activity : _activityModel->errorsList()) {
+        if (activity._expireAtMsecs > 0 && QDateTime::currentDateTime().toMSecsSinceEpoch() >= activity._expireAtMsecs) {
+            _activityModel->removeActivityFromActivityList(activity);
+        }
+    }
+
+    if (_activityModel->errorsList().size() == 0) {
+        _expiredActivitiesCheckTimer.stop();
+    }
+}
+
 void User::connectPushNotifications() const
 {
     connect(_account->account().data(), &Account::pushNotificationsDisabled, this, &User::slotDisconnectPushNotifications, Qt::UniqueConnection);
@@ -330,7 +350,8 @@ void User::slotProgressInfo(const QString &folder, const ProgressInfo &progress)
         const auto &engine = f->syncEngine();
         const auto style = engine.lastLocalDiscoveryStyle();
         foreach (Activity activity, _activityModel->errorsList()) {
-            if (activity._expireAtMsecs > 0 && QDateTime::currentDateTime().toMSecsSinceEpoch() < activity._expireAtMsecs) {
+            if (activity._expireAtMsecs > 0) {
+                // we process expired activities in a different slot
                 continue;
             }
             if (activity._folder != folder) {
@@ -424,27 +445,31 @@ void User::slotAddError(const QString &folderAlias, const QString &message, Erro
 
 void User::slotAddErrorToGui(const QString &folderAlias, SyncFileItem::Status status, const QString &errorMessage)
 {
-    auto folderInstance = FolderMan::instance()->folder(folderAlias);
+    const auto folderInstance = FolderMan::instance()->folder(folderAlias);
     if (!folderInstance)
         return;
 
     if (folderInstance->accountState() == _account.data()) {
         qCWarning(lcActivity) << "Item " << folderInstance->shortGuiLocalPath() << " retrieved resulted in " << errorMessage;
 
         Activity activity;
-        activity._type = Activity::SyncResultType;
+        activity._type = Activity::SyncFileItemType;
         activity._status = status;
         const auto currentDateTime = QDateTime::currentDateTime();
         activity._dateTime = QDateTime::fromString(currentDateTime.toString(), Qt::ISODate);
         activity._expireAtMsecs = currentDateTime.addSecs(60 * 1).toMSecsSinceEpoch();
-        activity._subject = errorMessage;
+        activity._subject = folderInstance->shortGuiLocalPath();
         activity._message = errorMessage;
         activity._link = folderInstance->shortGuiLocalPath();
         activity._accName = folderInstance->accountState()->account()->displayName();
         activity._folder = folderAlias;
 
         // add 'other errors' to activity list
         _activityModel->addErrorToActivityList(activity);
+
+        if (!_expiredActivitiesCheckTimer.isActive()) {
+            _expiredActivitiesCheckTimer.start(expiredActivitiesCheckIntervalMs);
+        }
     }
 }
 

diff --git a/src/gui/tray/UserModel.h b/src/gui/tray/UserModel.h
@@ -95,6 +95,7 @@ public slots:
     void slotDisconnectPushNotifications();
     void slotReceivedPushNotification(Account *account);
     void slotReceivedPushActivity(Account *account);
+    void slotCheckExpiredActivities();
 
     void connectPushNotifications() const;
     bool checkPushNotificationsAreReady() const;
@@ -110,6 +111,7 @@ public slots:
     ActivityListModel *_activityModel;
     ActivityList _blacklistedNotifications;
 
+    QTimer _expiredActivitiesCheckTimer;
     QTimer _notificationCheckTimer;
     QHash<AccountState *, QElapsedTimer> _timeSinceLastCheck;