ZP-361 #comment previous conflict settings (even default settings) are cached,...

ZP-361 #comment previous conflict settings (even default settings) are cached, so changing the default-if-not-defined was not honored #time 1h

git-svn-id: https://z-push.org/svn/z-push/trunk@1691 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/lib/request/sync.php

@@ -234,6 +234,9 @@ class Sync extends RequestProcessor {
                     // Do not truncate by default
                     $spa->SetTruncation(SYNC_TRUNCATION_ALL);
 
+                    // use default conflict handling if not specified by the mobile
+                    $spa->SetConflict(SYNC_CONFLICT_DEFAULT);
+
                     while(self::$decoder->getElementStartTag(SYNC_OPTIONS)) {
                         $firstOption = true;
                         while(1) {
@@ -339,11 +342,6 @@ class Sync extends RequestProcessor {
                             $spa->SetFilterType(SYNC_FILTERTIME_MAX);
                     }
 
-                    // set default conflict behavior from config if the device doesn't send a conflict resolution parameter
-                    if (! $spa->HasConflict()) {
-                        $spa->SetConflict(SYNC_CONFLICT_DEFAULT);
-                    }
-
                     // Check if the hierarchycache is available. If not, trigger a HierarchySync
                     if (self::$deviceManager->IsHierarchySyncRequired()) {
                         $status = SYNC_STATUS_FOLDERHIERARCHYCHANGED;