Commit 0dcac82f authored by skummer's avatar skummer

ZP-204

- fixed: ADD, MODIFY and DELETE trigger message in top
- fixed: warning when checking failstate for already deleted message

git-svn-id: https://z-push.org/svn/z-push/trunk@1419 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
parent 69306146
...@@ -1025,7 +1025,7 @@ class Sync extends RequestProcessor { ...@@ -1025,7 +1025,7 @@ class Sync extends RequestProcessor {
} }
// message was REMOVED before, do NOT attemp to remove it again // message was REMOVED before, do NOT attemp to remove it again
if ($todo == SYNC_REMOVE && $actiondata["failstate"]["removeids"][$serverid]) { if ($todo == SYNC_REMOVE && isset($actiondata["failstate"]["removeids"][$serverid])) {
$ignoreMessage = true; $ignoreMessage = true;
// make sure no messages are sent back // make sure no messages are sent back
...@@ -1041,6 +1041,7 @@ class Sync extends RequestProcessor { ...@@ -1041,6 +1041,7 @@ class Sync extends RequestProcessor {
if (!$ignoreMessage) { if (!$ignoreMessage) {
switch($todo) { switch($todo) {
case SYNC_MODIFY: case SYNC_MODIFY:
self::$topCollector->AnnounceInformation("Saving modified message");
try { try {
$actiondata["modifyids"][] = $serverid; $actiondata["modifyids"][] = $serverid;
...@@ -1072,6 +1073,7 @@ class Sync extends RequestProcessor { ...@@ -1072,6 +1073,7 @@ class Sync extends RequestProcessor {
break; break;
case SYNC_ADD: case SYNC_ADD:
self::$topCollector->AnnounceInformation("Creating new message from mobile");
try { try {
// check incoming message without logging WARN messages about errors // check incoming message without logging WARN messages about errors
if (!($message instanceof SyncObject) || !$message->Check(true)) { if (!($message instanceof SyncObject) || !$message->Check(true)) {
...@@ -1089,6 +1091,7 @@ class Sync extends RequestProcessor { ...@@ -1089,6 +1091,7 @@ class Sync extends RequestProcessor {
} }
break; break;
case SYNC_REMOVE: case SYNC_REMOVE:
self::$topCollector->AnnounceInformation("Deleting message removed on mobile");
try { try {
$actiondata["removeids"][] = $serverid; $actiondata["removeids"][] = $serverid;
// if message deletions are to be moved, move them // if message deletions are to be moved, move them
......
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