gui/tray: Handle troubled/no longer troubled file provider sync states

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
nextcloud · Feb 17, 2025 · b7d7bf3 · b7d7bf3
1 parent 8148815
commit b7d7bf3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/gui/tray/syncstatussummary.cpp b/src/gui/tray/syncstatussummary.cpp
@@ -168,7 +168,11 @@ void SyncStatusSummary::setSyncState(const SyncResult::Status state)
     case SyncResult::Success:
     case SyncResult::SyncPrepare:
         // Success should only be shown if all folders were fine
-        if (!folderErrors() || folderError(folder)) {
+        if (!folderErrors()
+#ifdef BUILD_FILE_PROVIDER_MODULE
+            && _fileProviderDomainsWithErrors.empty()
+#endif
+        ) {
             setSyncing(false);
             setTotalFiles(0);
             setSyncStatusString(tr("All synced!"));
@@ -232,6 +236,25 @@ void SyncStatusSummary::onFileProviderDomainSyncStateChanged(const AccountPtr &a
     if (!_accountState || !_accountState->isConnected() || account != _accountState->account()) {
         return;
     }
+
+    switch (state) {
+    case SyncResult::Success:
+    case SyncResult::SyncPrepare:
+        // Success should only be shown if all folders were fine
+        _fileProviderDomainsWithErrors.erase(account->userIdAtHostWithPort());
+        break;
+    case SyncResult::Error:
+    case SyncResult::SetupError:
+    case SyncResult::Problem:
+    case SyncResult::Undefined:
+        _fileProviderDomainsWithErrors.insert(account->userIdAtHostWithPort());
+    case SyncResult::SyncRunning:
+    case SyncResult::NotYetStarted:
+    case SyncResult::Paused:
+    case SyncResult::SyncAbortRequested:
+        break;
+    }
+
     setSyncState(state);
 }
 

diff --git a/src/gui/tray/syncstatussummary.h b/src/gui/tray/syncstatussummary.h
@@ -66,6 +66,10 @@ public slots:
     void onFolderSyncStateChanged(const Folder *folder);
     void onIsConnectedChanged();
 
+#ifdef BUILD_FILE_PROVIDER_MODULE
+    void onFileProviderDomainSyncStateChanged(const AccountPtr &account, const SyncResult::Status status);
+#endif
+
     void setSyncState(const SyncResult::Status state);
     void setSyncStateForFolder(const Folder *folder);
     void markFolderAsError(const Folder *folder);
@@ -87,6 +91,9 @@ public slots:
 
     AccountStatePtr _accountState;
     std::set<QString> _foldersWithErrors;
+#ifdef BUILD_FILE_PROVIDER_MODULE
+    std::set<QString> _fileProviderDomainsWithErrors;
+#endif
 
     QUrl _syncIcon = Theme::instance()->syncStatusOk();
     double _progress = 1.0;