diff options
| author | Rash419 <rashesh.padia@collabora.com> | 2022-02-11 13:44:27 +0530 |
|---|---|---|
| committer | Rashesh Padia <rasheshpadia419@gmail.com> | 2022-02-11 20:09:13 +0530 |
| commit | f77fcb6a20962b32e26692c165ca12b896000fe7 (patch) | |
| tree | a7c49f6aa0b605dc3497d0ffc5302cefb8e9711e | |
| parent | cypress: restore writer shape properties tests (diff) | |
| download | online-f77fcb6a20962b32e26692c165ca12b896000fe7.tar.gz online-f77fcb6a20962b32e26692c165ca12b896000fe7.zip | |
wsd: consider possibly-modified docs when handling conflicts
When the storage returns modified-in-storage or conflict status
to an upload attempt, we prompt the user to handle the conflict
when the document is modified. Previously, we only prompted
when we had the modified flag set, ignoring the possibility of
having a race with the modified flag, in case the document was
just modified, or potentially modified.
We now prompt the user even when the document is potentially
modified, giving the user the opportunity to decide what to do.
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: I699aaed92d41f76a8eb9de6bdb65608099802663
| -rw-r--r-- | wsd/DocumentBroker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 416fb47019..293be095e1 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1653,7 +1653,7 @@ void DocumentBroker::handleUploadToStorageResponse(const StorageBase::UploadResu LOG_ERR("PutFile says that Document changed in storage"); _documentChangedInStorage = true; const std::string message - = isModified() ? "error: cmd=storage kind=documentconflict" : "close: documentconflict"; + = isPossiblyModified() ? "error: cmd=storage kind=documentconflict" : "close: documentconflict"; broadcastMessage(message); broadcastSaveResult(false, "Conflict: Document changed in storage", |