Commit c5093fef authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1151 On FolderSync update the reference PolicyKey if it changed even

if there were no changes synchronized.

Released under the Affero GNU General Public License (AGPL) version 3.
parent da4787b0
...@@ -248,11 +248,17 @@ class FolderSync extends RequestProcessor { ...@@ -248,11 +248,17 @@ class FolderSync extends RequestProcessor {
// update SPA & save it // update SPA & save it
$spa->SetSyncKey($newsynckey); $spa->SetSyncKey($newsynckey);
$spa->SetFolderId(false); $spa->SetFolderId(false);
self::$deviceManager->GetStateManager()->SetSynchedFolderState($spa);
// invalidate all pingable flags // invalidate all pingable flags
SyncCollections::InvalidatePingableFlags(); SyncCollections::InvalidatePingableFlags();
} }
// save the SyncParameters if it changed or the reference policy key is not set or different
if ($spa->IsDataChanged() || !$spa->HasReferencePolicyKey() || self::$deviceManager->ProvisioningRequired($spa->GetReferencePolicyKey(), true, false)) {
// saves the SPA (while updating the reference policy key)
$spa->SetLastSynctime(time());
self::$deviceManager->GetStateManager()->SetSynchedFolderState($spa);
}
} }
} }
self::$encoder->endTag(); self::$encoder->endTag();
......
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