Do not compare apples and pears during the mailbox sync

The sync was comparing IDs with message UIDs, hence it occasionally told
the client that all known messages vanished. On the next sync request it
said everything that just vanished was suddenly a new message.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

lib/Service/Sync/SyncService.php

@@ -145,13 +145,15 @@ class SyncService {
 
 		if ($query !== null) {
 			// Filter new messages to those that also match the current filter
-			$newIds = $this->messageMapper->findIdsByQuery($mailbox, $query, null, $newIds);
+			$newUids = $this->messageMapper->findUidsForIds($mailbox, $newIds);
+			$newIds = $this->messageMapper->findIdsByQuery($mailbox, $query, null, $newUids);
 		}
 		$new = $this->messageMapper->findByIds($newIds);
 
 		// TODO: $changed = $this->messageMapper->findChanged($mailbox, $uids);
 		if ($query !== null) {
-			$changedIds = $this->messageMapper->findIdsByQuery($mailbox, $query, null, $knownIds);
+			$changedUids = $this->messageMapper->findUidsForIds($mailbox, $knownIds);
+			$changedIds = $this->messageMapper->findIdsByQuery($mailbox, $query, null, $changedUids);
 		} else {
 			$changedIds = $knownIds;
 		}