projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 26d62a9) | patch
Move some of the SocketApi conflict handling in a ConflictSolver class
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 7 Oct 2020 14:30:43 +0000 (16:30 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Thu, 22 Oct 2020 14:40:46 +0000 (16:40 +0200)
commit4fdb203cdb39ead4ab6fc16a9323f7fad65cb53d
treeb43288453ac33aadf636f96119464a087e0a6505tree | snapshot
parent26d62a9712b8fa147813e57c2b490ccbc695bff8commit | diff
Move some of the SocketApi conflict handling in a ConflictSolver class

The socket api move and delete commands are not strictly about conflicts
since they also deal with files which couldn't be uploaded for some
other reason. Still the new ConflictSolver could be used in those cases.

This opens the door at reusing that logic in other places.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/gui/CMakeLists.txt diff | blob | history
src/gui/conflictsolver.cpp [new file with mode: 0644] blob
src/gui/conflictsolver.h [new file with mode: 0644] blob
src/gui/socketapi.cpp diff | blob | history
test/CMakeLists.txt diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.