refactor(quota): replace _httpErrorCode 507 with _isQuotaError bool flag.

Instead of faking an HTTP 507 response code on items that exceeded quota
during discovery, rename the unused _errorMayBeBlacklisted field to
_isQuotaError and set it at the three discovery call sites.
blacklistUpdate already checked that flag for the mayBlacklist gate;
createBlacklistEntry now checks it alongside the real HTTP 507
path to write the InsufficientRemoteStorage category.

Signed-off-by: Camila Ayres <hello@camilasan.com>

Author: camilasan

src/libsync/discovery.cpp

@@ -1250,11 +1250,10 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
             }
 
             item->_status = SyncFileItem::Status::NormalError;
-            // Mark as a quota error so blacklistUpdate writes an InsufficientRemoteStorage entry.
-            // Without this, _httpErrorCode would be 0 and blacklistUpdate would not create an
-            // entry, leaving the file unprotected by checkNewDeleteConflict if the remote parent
-            // folder is deleted before the quota situation is resolved.
-            item->_httpErrorCode = 507;
+            // Flag as a quota error so blacklistUpdate writes an InsufficientRemoteStorage entry,
+            // which checkNewDeleteConflict uses to protect the file if its parent folder is later
+            // deleted on the server before the quota situation is resolved.
+            item->_isQuotaError = true;
             _discoveryData->_anotherSyncNeeded = true;
             _discoveryData->_filesNeedingScheduledSync.insert(path._original, delayIntervalForSyncRetryForFilesExceedQuotaSeconds);
         }
@@ -2557,9 +2556,7 @@ bool ProcessDirectoryJob::checkNewDeleteConflict(const SyncFileItemPtr &item, in
                            << item->_file;
         item->_instruction = CSYNC_INSTRUCTION_ERROR;
         item->_status = SyncFileItem::SoftError;
-        // Keep _httpErrorCode at 507 so blacklistUpdate recreates the InsufficientRemoteStorage
-        // entry if the ignore duration later expires.
-        item->_httpErrorCode = 507;
+        item->_isQuotaError = true;
         item->_errorString = tr("%1 could not be removed: it has unsynced changes due to full server storage. "
                                 "Please manage your files and try syncing again.")
                                  .arg(item->_file);
@@ -2582,7 +2579,7 @@ bool ProcessDirectoryJob::checkNewDeleteConflict(const SyncFileItemPtr &item, in
                                    << item->_file;
                 item->_instruction = CSYNC_INSTRUCTION_ERROR;
                 item->_status = SyncFileItem::SoftError;
-                item->_httpErrorCode = 507;
+                item->_isQuotaError = true;
                 item->_errorString = tr("\"%1\" was not deleted because its latest changes were not synced "
                                         "and your server quota was exceeded. "
                                         "Please manage your storage and try syncing again.")

src/libsync/owncloudpropagator.cpp

@@ -158,7 +158,7 @@ static SyncJournalErrorBlacklistRecord createBlacklistEntry(
         entry._ignoreDuration = 0;
     }
 
-    if (item._httpErrorCode == 507) {
+    if (item._isQuotaError || item._httpErrorCode == 507) {
         entry._errorCategory = SyncJournalErrorBlacklistRecord::InsufficientRemoteStorage;
         // Quota can change at any time (user frees space, admin adjusts limits).
         // Always retry on the next sync rather than backing off exponentially.
@@ -177,11 +177,11 @@ void blacklistUpdate(SyncJournalDb *journal, SyncFileItem &item)
     SyncJournalErrorBlacklistRecord oldEntry = journal->errorBlacklistEntry(item._file);
 
     bool mayBlacklist =
-        item._errorMayBeBlacklisted // explicitly flagged for blacklisting
+        item._isQuotaError // quota errors always get an InsufficientRemoteStorage entry
         || ((item._status == SyncFileItem::NormalError
                 || item._status == SyncFileItem::SoftError
                 || item._status == SyncFileItem::DetailError)
-               && item._httpErrorCode != 0 // or non-local error
+               && item._httpErrorCode != 0 // non-local error
                );
 
     // No new entry? Possibly remove the old one, then done.

src/libsync/syncfileitem.h

@@ -130,7 +130,7 @@ class OWNCLOUDSYNC_EXPORT SyncFileItem
         , _direction(None)
         , _serverHasIgnoredFiles(false)
         , _hasBlacklistEntry(false)
-        , _errorMayBeBlacklisted(false)
+        , _isQuotaError(false)
         , _status(NoStatus)
         , _isRestoration(false)
         , _isSelectiveSync(false)
@@ -261,12 +261,12 @@ class OWNCLOUDSYNC_EXPORT SyncFileItem
     /// without the status being FileIgnored.
     bool _hasBlacklistEntry BITFIELD(1);
 
-    /** If true and NormalError, this error may be blacklisted
+    /** True when discovery detected that this item exceeds the remote storage quota.
      *
-     * Note that non-local errors (httpErrorCode!=0) may also be
-     * blacklisted independently of this flag.
+     * Causes blacklistUpdate to write an InsufficientRemoteStorage entry even
+     * though no HTTP request was made (and _httpErrorCode is therefore 0).
      */
-    bool _errorMayBeBlacklisted BITFIELD(1);
+    bool _isQuotaError BITFIELD(1);
 
     // Variables useful to report to the user
     Status _status BITFIELD(4);