Review comments. Part II.

Signed-off-by: alex-z <[email protected]>
nextcloud · Dec 6, 2023 · 0d44818 · 0d44818
1 parent 07e0504
commit 0d44818
Show file tree

Hide file tree

Showing 18 changed files with 738 additions and 490 deletions.
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
@@ -26,6 +26,12 @@ set(libsync_SRCS
     clientproxy.cpp
     clientstatusreporting.h
     clientstatusreporting.cpp
+    clientstatusreportingcommon.h
+    clientstatusreportingcommon.cpp
+    clientstatusreportingdatabase.h
+    clientstatusreportingdatabase.cpp
+    clientstatusreportingnetwork.h
+    clientstatusreportingnetwork.cpp
     clientstatusreportingrecord.h
     cookiejar.h
     cookiejar.cpp

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
@@ -296,7 +296,7 @@ void Account::trySetupClientStatusReporting()
     }
 }
 
-void Account::reportClientStatus(const ClientStatusReporting::Status status) const
+void Account::reportClientStatus(const ClientStatusReportingStatus status) const
 {
     if (_clientStatusReporting) {
         _clientStatusReporting->reportClientStatus(status);

diff --git a/src/libsync/account.h b/src/libsync/account.h
@@ -308,7 +308,7 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject
 
     void trySetupClientStatusReporting();
 
-    void reportClientStatus(const ClientStatusReporting::Status status) const;
+    void reportClientStatus(const ClientStatusReportingStatus status) const;
 
     [[nodiscard]] std::shared_ptr<UserStatusConnector> userStatusConnector() const;
 

diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
@@ -1262,7 +1262,7 @@ bool ClientSideEncryption::sensitiveDataRemaining() const
 void ClientSideEncryption::failedToInitialize(const AccountPtr &account)
 {
     forgetSensitiveData(account);
-    account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+    account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
     Q_EMIT initializationFinished();
 }
 
@@ -1776,7 +1776,7 @@ void FolderMetadata::setupExistingMetadata(const QByteArray& metadata)
 
         if (metadataKeys.isEmpty()) {
             qCDebug(lcCse()) << "Could not migrate. No metadata keys found!";
-            _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+            _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
             return;
         }
 
@@ -1789,7 +1789,7 @@ void FolderMetadata::setupExistingMetadata(const QByteArray& metadata)
 
     if (_metadataKey.isEmpty()) {
         qCDebug(lcCse()) << "Could not setup existing metadata with missing metadataKeys!";
-        _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+        _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
         return;
     }
 
@@ -1864,7 +1864,7 @@ void FolderMetadata::setupExistingMetadata(const QByteArray& metadata)
         } else {
             _metadataKey.clear();
             _files.clear();
-            _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+            _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
             return;
         }
     }
@@ -1903,7 +1903,7 @@ QByteArray FolderMetadata::decryptData(const QByteArray &data) const
     if (decryptResult.isEmpty())
     {
         qCDebug(lcCse()) << "ERROR. Could not decrypt the metadata key";
-        _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+        _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
         return {};
     }
     return QByteArray::fromBase64(decryptResult);
@@ -1921,7 +1921,7 @@ QByteArray FolderMetadata::decryptDataUsingKey(const QByteArray &data,
     if (decryptResult.isEmpty())
     {
         qCDebug(lcCse()) << "ERROR. Could not decrypt";
-        _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+        _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
         return {};
     }
 
@@ -1985,7 +1985,7 @@ QByteArray FolderMetadata::encryptedMetadata() const {
 
     if (_metadataKey.isEmpty()) {
         qCDebug(lcCse) << "Metadata generation failed! Empty metadata key!";
-        _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+        _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
         return {};
     }
     const auto version = _account->capabilities().clientSideEncryptionVersion();
@@ -2007,7 +2007,7 @@ QByteArray FolderMetadata::encryptedMetadata() const {
 
         QString encryptedEncrypted = encryptJsonObject(encryptedDoc.toJson(QJsonDocument::Compact), _metadataKey);
         if (encryptedEncrypted.isEmpty()) {
-            _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+            _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
             qCDebug(lcCse) << "Metadata generation failed!";
         }
         QJsonObject file;
@@ -2095,7 +2095,7 @@ bool FolderMetadata::moveFromFileDropToFiles()
 
         if (decryptedKey.isEmpty() || decryptedAuthenticationTag.isEmpty() || decryptedInitializationVector.isEmpty()) {
             qCDebug(lcCseMetadata) << "failed to decrypt filedrop entry" << it.key();
-            _account->reportClientStatus(OCC::ClientStatusReporting::Status::E2EeError_GeneralError);
+            _account->reportClientStatus(OCC::ClientStatusReportingStatus::E2EeError_GeneralError);
             continue;
         }