Philipp Hörist pushed to branch master at gajim / gajim
Commits:
1 changed file:
Changes:
| ... | ... | @@ -39,6 +39,8 @@ class Receipts(BaseModule): |
| 39 | 39 |
return
|
| 40 | 40 |
|
| 41 | 41 |
if properties.type.is_error:
|
| 42 |
+ if properties.receipt.is_request:
|
|
| 43 |
+ return
|
|
| 42 | 44 |
# Don't propagate this event further
|
| 43 | 45 |
raise nbxmpp.NodeProcessed
|
| 44 | 46 |
|
| ... | ... | @@ -56,6 +58,12 @@ class Receipts(BaseModule): |
| 56 | 58 |
if not app.config.get_per('accounts', self._account,
|
| 57 | 59 |
'answer_receipts'):
|
| 58 | 60 |
return
|
| 61 |
+ |
|
| 62 |
+ if properties.eme is not None:
|
|
| 63 |
+ # Don't send receipt for message which couldn't be decrypted
|
|
| 64 |
+ if not properties.is_encrypted:
|
|
| 65 |
+ return
|
|
| 66 |
+ |
|
| 59 | 67 |
contact = self._get_contact(properties)
|
| 60 | 68 |
if contact is None:
|
| 61 | 69 |
return
|