Update the metadata table with encryption info before discovery

When the ClientSideEncryption object is fed, also serialize the
encryption info of the folders inside the metadata table.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 1875100ef467bf14c80c55ffc5e88dc4c4a4dc56..cd20bf4bede491362fe588f84f352ec302faa607 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -869,10 +869,53 @@ void SyncEngine::startSync()
     }
 }
 
-void SyncEngine::onFolderEncryptedStatusFetchDone()
+void SyncEngine::onFolderEncryptedStatusFetchDone(const QHash<QString, bool> &values)
 {
     disconnect(_account->e2e(), &ClientSideEncryption::folderEncryptedStatusFetchDone,
                this, &SyncEngine::onFolderEncryptedStatusFetchDone);
+
+    Q_ASSERT(_remotePath.startsWith('/'));
+    const auto rootPath = [=]() {
+        const auto result = _remotePath;
+        if (result.startsWith('/')) {
+            return result.mid(1);
+        } else {
+            return result;
+        }
+    }();
+
+    std::for_each(values.constKeyValueBegin(), values.constKeyValueEnd(), [=](const std::pair<QString, bool> &pair) {
+        const auto key = pair.first;
+        const auto value = pair.second;
+
+        if (!key.startsWith(rootPath)) {
+            return;
+        }
+
+        Q_ASSERT(key.endsWith('/'));
+        const auto path = key.mid(rootPath.length()).chopped(1);
+
+        if (path.isEmpty()) {
+            // We don't store metadata about the root
+            return;
+        }
+
+        SyncJournalFileRecord rec;
+        _journal->getFileRecordByE2eMangledName(path, &rec);
+
+        if (!rec.isValid()) {
+            _journal->getFileRecord(path, &rec);
+        }
+
+        if (!rec.isValid()) {
+            // We don't know that folder yet anyway...
+            return;
+        }
+
+        rec._isE2eEncrypted = value;
+        _journal->setFileRecord(rec);
+    });
+
     slotStartDiscovery();
 }
 

diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h
index 7f21eee3e948e7565c0d745ef3d5ebdbc5d5264c..d186bc6271d7da123be3ebe943d112cc9ddae823 100644 (file)
--- a/src/libsync/syncengine.h
+++ b/src/libsync/syncengine.h
@@ -168,7 +168,7 @@ signals:
     void seenLockedFile(const QString &fileName);
 
 private slots:
-    void onFolderEncryptedStatusFetchDone();
+    void onFolderEncryptedStatusFetchDone(const QHash<QString, bool> &values);
     void slotStartDiscovery();
 
     void slotFolderDiscovered(bool local, const QString &folder);