From a8534800b0cf9a55a4e7514eb46edf0e58f0baeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Thu, 30 Aug 2018 19:18:03 +0200
Subject: [PATCH] Parse delay after decryption

Delay could be encrypted with full stanza encryption
---
 gajim/common/modules/message.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gajim/common/modules/message.py b/gajim/common/modules/message.py
index 086a47c55..bf9a31771 100644
--- a/gajim/common/modules/message.py
+++ b/gajim/common/modules/message.py
@@ -178,10 +178,6 @@ class Message:
 
             session.last_receive = time.time()
 
-        timestamp = parse_delay(stanza)
-        if timestamp is None:
-            timestamp = time.time()
-
         event_attr = {
             'conn': self._con,
             'stanza': stanza,
@@ -191,7 +187,6 @@ class Message:
             'additional_data': {},
             'forwarded': forwarded,
             'sent': sent,
-            'timestamp': timestamp,
             'fjid': fjid,
             'jid': jid,
             'resource': resource,
@@ -223,6 +218,11 @@ class Message:
         except nbxmpp.NodeProcessed:
             return
 
+        timestamp, delayed = parse_delay(event.stanza), True
+        if timestamp is None:
+            timestamp = time.time()
+            delayed = False
+
         event_attr = {
             'popup': False,
             'msg_log_id': None,
@@ -234,6 +234,8 @@ class Message:
             'form_node': parse_form(event.stanza),
             'xhtml': parse_xhtml(event.stanza),
             'chatstate': parse_chatstate(event.stanza),
+            'timestamp': timestamp,
+            'delayed': delayed,
         }
         parse_oob(event.stanza, event.additional_data)
 
@@ -245,7 +247,7 @@ class Message:
                 event.msgtxt = _('message')
             self._con.dispatch_error_message(
                 event.stanza, event.msgtxt,
-                event.session, event.fjid, event.timestamp)
+                event.session, event.fjid, timestamp)
             return
 
         if event.mtype == 'groupchat':