Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Sophie Herold
gajim
Commits
8a342611
Commit
8a342611
authored
Aug 30, 2018
by
Philipp Hörist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Parse delay after decryption
Delay could be encrypted with full stanza encryption
parent
08d0cde9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
gajim/common/modules/message.py
gajim/common/modules/message.py
+8
-6
No files found.
gajim/common/modules/message.py
View file @
8a342611
...
...
@@ -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'
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment