Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
3512e2f9
by Philipp Hörist at 2020-02-02T16:58:29+01:00
2 changed files:
Changes:
| ... | ... | @@ -244,7 +244,8 @@ class HTTPUpload(BaseModule): |
| 244 | 244 |
jid=transfer.contact.jid,
|
| 245 | 245 |
message=uri,
|
| 246 | 246 |
type_=type_,
|
| 247 |
- oob_url=uri)
|
|
| 247 |
+ oob_url=uri,
|
|
| 248 |
+ encryption=transfer.encryption)
|
|
| 248 | 249 |
|
| 249 | 250 |
self._con.send_message(message)
|
| 250 | 251 |
|
| ... | ... | @@ -1591,7 +1591,8 @@ class GroupchatControl(ChatControlBase): |
| 1591 | 1591 |
type_='groupchat',
|
| 1592 | 1592 |
label=label,
|
| 1593 | 1593 |
chatstate=chatstate,
|
| 1594 |
- correct_id=correct_id)
|
|
| 1594 |
+ correct_id=correct_id,
|
|
| 1595 |
+ encryption=self.encryption)
|
|
| 1595 | 1596 |
message_.additional_data.set_value('gajim', 'xhtml', xhtml)
|
| 1596 | 1597 |
con.send_message(message_)
|
| 1597 | 1598 |
|