Merge pull request #119 in ZP/z-push from...

Merge pull request #119 in ZP/z-push from bugfix/ZP-784-sync-with-remove-fails-if-source-message to develop

* commit 'eb7f48ba':
  ZP-784 Consider all StatusException with SYNC_MOVEITEMSTATUS_SUCCESS a SYNC_STATUS_SUCCESS and rewrite all other codes to SYNC_STATUS_OBJECTNOTFOUND.

(cherry picked from commit f0543584)

src/lib/request/sync.php

@@ -1258,8 +1258,8 @@ class Sync extends RequestProcessor {
                                 $folderid = self::$backend->GetWasteBasket();
 
                                 if($folderid) {
-                                    $this->importer->ImportMessageMove($serverid, $folderid);
                                     $actiondata["statusids"][$serverid] = SYNC_STATUS_SUCCESS;
+                                    $this->importer->ImportMessageMove($serverid, $folderid);
                                     break;
                                 }
                                 else
@@ -1271,7 +1271,9 @@ class Sync extends RequestProcessor {
                         }
                     }
                     catch (StatusException $stex) {
-                       $actiondata["statusids"][$serverid] = $stex->getCode();
+                        if($stex->getCode() != SYNC_MOVEITEMSSTATUS_SUCCESS) {
+                            $actiondata["statusids"][$serverid] = SYNC_STATUS_OBJECTNOTFOUND;
+                        }
                     }
                     break;
             }
@@ -1280,4 +1282,4 @@ class Sync extends RequestProcessor {
     }
 }
 
-?>
+?>
\ No newline at end of file