Merge pull request #5592 from nextcloud/backport/5588/stable-3.8

[stable-3.8] Edit locally. Restart current folder sync immediately after file opened.
nextcloud · Apr 11, 2023 · a9c2194 · a9c2194
2 parents 22e15ba + 364f7b5
commit a9c2194
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/gui/editlocallyjob.cpp b/src/gui/editlocallyjob.cpp
@@ -452,6 +452,7 @@ void EditLocallyJob::startEditLocally()
         });
         _folderForFile->setSilenceErrorsUntilNextSync(true);
         _folderForFile->slotTerminateSync();
+        _shouldScheduleFolderSyncAfterFileIsOpened = true;
 
         return;
     }
@@ -538,6 +539,8 @@ void EditLocallyJob::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
 
 void EditLocallyJob::openFile()
 {
+    Q_ASSERT(_folderForFile);
+
     if(_localFilePath.isEmpty()) {
         qCWarning(lcEditLocallyJob) << "Could not edit locally. Invalid local file path.";
         return;
@@ -553,6 +556,11 @@ void EditLocallyJob::openFile()
         }
 
         Systray::instance()->destroyEditFileLocallyLoadingDialog();
+
+        if (_shouldScheduleFolderSyncAfterFileIsOpened) {
+            _folderForFile->startSync();
+        }
+
         emit finished();
     });
 }

diff --git a/src/gui/editlocallyjob.h b/src/gui/editlocallyjob.h
@@ -92,6 +92,8 @@ private slots:
 
     bool _tokenVerified = false;
 
+    bool _shouldScheduleFolderSyncAfterFileIsOpened = false;
+
     AccountStatePtr _accountState;
     QString _userId;
     QString _relPath; // full remote path for a file (as on the server)