Commit 141a425d authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1239 Don't send server side changes if performing incoming actions.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 54cb4db0
...@@ -631,7 +631,11 @@ class Sync extends RequestProcessor { ...@@ -631,7 +631,11 @@ class Sync extends RequestProcessor {
foreach($sc as $folderid => $spa) { foreach($sc as $folderid => $spa) {
// manually set getchanges parameter for this collection if it is synchronized // manually set getchanges parameter for this collection if it is synchronized
if ($spa->HasSyncKey()) { if ($spa->HasSyncKey()) {
$sc->AddParameter($spa, "getchanges", true); $actiondata = $sc->GetParameter($spa, "actiondata");
// request changes if no other actions are executed
if (empty($actiondata["modifyids"]) && empty($actiondata["clientids"]) && empty($actiondata["removeids"])) {
$sc->AddParameter($spa, "getchanges", true);
}
// announce WindowSize to DeviceManager // announce WindowSize to DeviceManager
self::$deviceManager->SetWindowSize($folderid, $spa->GetWindowSize()); self::$deviceManager->SetWindowSize($folderid, $spa->GetWindowSize());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment