Commit 3fd96387 authored by Tijmen de Mes's avatar Tijmen de Mes

Moved timestamp and message

parent 7f2b4da4
...@@ -740,6 +740,9 @@ class MessageManager(object, metaclass=Singleton): ...@@ -740,6 +740,9 @@ class MessageManager(object, metaclass=Singleton):
session_manager = SessionManager() session_manager = SessionManager()
notification_center = NotificationCenter() notification_center = NotificationCenter()
timestamp = str(cpim_message.timestamp) if cpim_message is not None and cpim_message.timestamp is not None else str(ISOTimestamp.now())
message = BlinkMessage(body, content_type, sender, timestamp=timestamp, id=message_id, disposition=disposition, direction='incoming')
try: try:
blink_session = next(session for session in self.sessions if session.contact.settings is contact.settings) blink_session = next(session for session in self.sessions if session.contact.settings is contact.settings)
except StopIteration: except StopIteration:
...@@ -786,9 +789,6 @@ class MessageManager(object, metaclass=Singleton): ...@@ -786,9 +789,6 @@ class MessageManager(object, metaclass=Singleton):
notification_center.post_notification('BlinkGotComposingIndication', sender=blink_session, data=data) notification_center.post_notification('BlinkGotComposingIndication', sender=blink_session, data=data)
return return
timestamp = str(cpim_message.timestamp) if cpim_message is not None and cpim_message.timestamp is not None else str(ISOTimestamp.now())
return
message = BlinkMessage(body, content_type, sender, timestamp=timestamp, id=message_id, disposition=disposition)
if encryption == 'OpenPGP': if encryption == 'OpenPGP':
if blink_session.fake_streams.get('messages').can_decrypt: if blink_session.fake_streams.get('messages').can_decrypt:
......
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