refactor(discovery): extract applyE2eeEncryptionStatusForLocalNew

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

Author: solracsf

src/libsync/discovery.cpp

@@ -1137,6 +1137,23 @@ int64_t ProcessDirectoryJob::folderBytesAvailable(const SyncFileItemPtr &item, c
     return _dirItem->_folderQuota.bytesAvailable;
 }
 
+void ProcessDirectoryJob::applyE2eeEncryptionStatusForLocalNew(const SyncFileItemPtr &item,
+                                                               const SyncJournalFileRecord &base)
+{
+    // renaming the encrypted folder is done via remove + re-upload hence we need to mark the
+    // newly created folder as encrypted.  base is the DB record with the old name and encryption info.
+    item->_e2eEncryptionStatus = EncryptionStatusEnums::fromDbEncryptionStatus(base._e2eEncryptionStatus);
+    item->_e2eEncryptionServerCapability = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(
+        _discoveryData->_account->capabilities().clientSideEncryptionVersion());
+    if (item->_e2eEncryptionStatus != item->_e2eEncryptionServerCapability) {
+        item->_e2eEncryptionStatus = item->_e2eEncryptionServerCapability;
+        if (base._e2eEncryptionStatus != SyncJournalFileRecord::EncryptionStatus::NotEncrypted) {
+            Q_ASSERT(item->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::NotEncrypted);
+        }
+    }
+    Q_ASSERT(item->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::NotEncrypted);
+}
+
 void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
     const SyncFileItemPtr &item, PathTuple path, const LocalInfo &localEntry,
     const RemoteInfo &serverEntry, const SyncJournalFileRecord &dbEntry, QueryMode recurseQueryServer)
@@ -1577,17 +1594,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
     // If it's not a move it's just a local-NEW
     if (!isMove || (isE2eeMove && !isE2eeMoveOnlineOnlyItemWithCfApi)) {
         if (base.isE2eEncrypted()) {
-            // renaming the encrypted folder is done via remove + re-upload hence we need to mark the newly created folder as encrypted
-            // base is a record in the SyncJournal database that contains the data about the being-renamed folder with it's old name and encryption information
-            item->_e2eEncryptionStatus = EncryptionStatusEnums::fromDbEncryptionStatus(base._e2eEncryptionStatus);
-            item->_e2eEncryptionServerCapability = EncryptionStatusEnums::fromEndToEndEncryptionApiVersion(_discoveryData->_account->capabilities().clientSideEncryptionVersion());
-            if (item->_e2eEncryptionStatus != item->_e2eEncryptionServerCapability) {
-                item->_e2eEncryptionStatus = item->_e2eEncryptionServerCapability;
-                if (base._e2eEncryptionStatus != SyncJournalFileRecord::EncryptionStatus::NotEncrypted) {
-                    Q_ASSERT(item->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::NotEncrypted);
-                }
-            }
-            Q_ASSERT(item->_e2eEncryptionStatus != SyncFileItem::EncryptionStatus::NotEncrypted);
+            applyE2eeEncryptionStatusForLocalNew(item, base);
         }
         postProcessLocalNew();
         finalize();

src/libsync/discovery.h

@@ -205,6 +205,7 @@ class ProcessDirectoryJob : public QObject
     MovePermissionResult checkMovePermissions(RemotePermissions srcPerm, const QString &srcPath, bool isDirectory);
 
     void updateDirItemFromServerJob(DiscoverySingleDirectoryJob *serverJob);
+    void applyE2eeEncryptionStatusForLocalNew(const SyncFileItemPtr &item, const SyncJournalFileRecord &base);
     void processBlacklisted(const PathTuple &, const LocalInfo &, const SyncJournalFileRecord &dbEntry);
     void subJobFinished();