summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-30 11:17:46 +0100
committerErik Johnston <erik@matrix.org>2016-08-30 11:17:46 +0100
commit1ee6285905a9c7c038eba9149dbdd67c1945b2e9 (patch)
tree8ad5d0a4a9aedc10e305e142bfa7c0b07e39bf38 /synapse/handlers
parentNoop get_new_messages_for_device if token hasn't changed (diff)
downloadsynapse-1ee6285905a9c7c038eba9149dbdd67c1945b2e9.tar.xz
Fix check
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 8a3e04c28a..a8f8b9a75a 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -565,13 +565,12 @@ class SyncHandler(object):
         if sync_result_builder.since_token is not None:
             since_stream_id = int(sync_result_builder.since_token.to_device_key)
 
-        if since_stream_id:
+        if since_stream_id != int(now_token.to_device_key):
             logger.debug("Deleting messages up to %d", since_stream_id)
             yield self.store.delete_messages_for_device(
                 user_id, device_id, since_stream_id
             )
 
-        if since_stream_id and since_stream_id == int(now_token.to_device_key):
             logger.debug("Getting messages up to %d", now_token.to_device_key)
             messages, stream_id = yield self.store.get_new_messages_for_device(
                 user_id, device_id, now_token.to_device_key