Persist filter settings for Not Synced tab

Fixes: #10884
owncloud · Jun 14, 2023 · 419c1ee · 419c1ee
1 parent 6088104
commit 419c1ee
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 2 deletions.
diff --git a/src/gui/issueswidget.cpp b/src/gui/issueswidget.cpp
@@ -58,7 +58,7 @@ class SyncFileItemStatusSetSortFilterProxyModel : public Models::SignalledQSortF
     explicit SyncFileItemStatusSetSortFilterProxyModel(QObject *parent = nullptr)
         : Models::SignalledQSortFilterProxyModel(parent)
     {
-        resetFilter();
+        restoreFilter();
     }
 
     ~SyncFileItemStatusSetSortFilterProxyModel() override
@@ -70,10 +70,13 @@ class SyncFileItemStatusSetSortFilterProxyModel : public Models::SignalledQSortF
         return _filter;
     }
 
-    void setFilter(const StatusSet &newFilter)
+    void setFilter(const StatusSet &newFilter, bool save = true)
     {
         if (_filter != newFilter) {
             _filter = newFilter;
+            if (save) {
+                saveFilter();
+            }
             invalidateFilter();
             emit filterChanged();
         }
@@ -138,6 +141,44 @@ class SyncFileItemStatusSetSortFilterProxyModel : public Models::SignalledQSortF
         return defaultSet;
     }
 
+    void saveFilter()
+    {
+        QStringList checked;
+        for (uint8_t s = SyncFileItem::NoStatus; s < SyncFileItem::StatusCount; ++s) {
+            if (_filter[s]) {
+                checked.append(Utility::enumToString(static_cast<SyncFileItem::Status>(s)));
+            }
+        }
+        ConfigFile().setIssuesWidgetFilter(checked);
+    }
+
+    void restoreFilter()
+    {
+        StatusSet filter;
+        bool filterNeedsReset = true; // If there is no filter, the `true` value will cause a reset.
+        QStringList checked = ConfigFile().issuesWidgetFilter();
+
+        for (const QString &s : checked) {
+            auto status = Utility::stringToEnum<SyncFileItem::Status>(s);
+            if (static_cast<int8_t>(status) == -1) {
+                // The string value is not a valid enum value, so stop processing, and queue a reset.
+                filterNeedsReset = true;
+                break;
+            } else {
+                filter[status] = true;
+                filterNeedsReset = false;
+            }
+        }
+
+        if (filterNeedsReset) {
+            // If there was no filter in the config file, or if one of the values is invalid, reset the filter.
+            resetFilter();
+        } else {
+            // There is a valid filter, so apply it. Also don't save it, because we just loaded it successfully
+            setFilter(filter, false);
+        }
+    }
+
 private:
     StatusSet _filter;
 };

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
@@ -91,7 +91,12 @@ const QString newBigFolderSizeLimitC() { return QStringLiteral("newBigFolderSize
 const QString useNewBigFolderSizeLimitC() { return QStringLiteral("useNewBigFolderSizeLimit"); }
 const QString confirmExternalStorageC() { return QStringLiteral("confirmExternalStorage"); }
 const QString moveToTrashC() { return QStringLiteral("moveToTrash"); }
+
+const QString issuesWidgetFilterC()
+{
+    return QStringLiteral("issuesWidgetFilter");
 }
+} // anonymous namespace
 
 QString ConfigFile::_confDir = QString();
 const std::chrono::seconds DefaultRemotePollInterval { 30 };
@@ -146,6 +151,19 @@ void ConfigFile::setShowInExplorerNavigationPane(bool show)
     settings.sync();
 }
 
+QStringList ConfigFile::issuesWidgetFilter() const
+{
+    auto settings = makeQSettings();
+    return settings.value(issuesWidgetFilterC()).toStringList();
+}
+
+void ConfigFile::setIssuesWidgetFilter(const QStringList &checked)
+{
+    auto settings = makeQSettings();
+    settings.setValue(issuesWidgetFilterC(), checked);
+    settings.sync();
+}
+
 std::chrono::seconds ConfigFile::timeout() const
 {
     auto settings = makeQSettings();

diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
@@ -158,6 +158,9 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     bool showInExplorerNavigationPane() const;
     void setShowInExplorerNavigationPane(bool show);
 
+    QStringList issuesWidgetFilter() const;
+    void setIssuesWidgetFilter(const QStringList &checked);
+
     std::chrono::seconds timeout() const;
     qint64 chunkSize() const;
     qint64 maxChunkSize() const;