Mercurial > libervia-desktop-kivy
annotate cagou/plugins/plugin_wid_chat.py @ 458:1dd6db69406a
core: update avatar handling following backend changes:
new avatar data format is handled. When ContactItem is created, avatar and nicknames are
requested to backend if they are not already in cache.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Tue, 14 Apr 2020 21:14:44 +0200 |
| parents | 642cd2435e26 |
| children | 3c9ba4a694ef |
| rev | line source |
|---|---|
| 379 | 1 #!/usr/bin/env python3 |
| 22 | 2 |
| 3 # Cagou: desktop/mobile frontend for Salut à Toi XMPP client | |
| 378 | 4 # Copyright (C) 2016-2020 Jérôme Poisson (goffi@goffi.org) |
| 22 | 5 |
| 6 # This program is free software: you can redistribute it and/or modify | |
| 7 # it under the terms of the GNU Affero General Public License as published by | |
| 8 # the Free Software Foundation, either version 3 of the License, or | |
| 9 # (at your option) any later version. | |
| 10 | |
| 11 # This program is distributed in the hope that it will be useful, | |
| 12 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 # GNU Affero General Public License for more details. | |
| 15 | |
| 16 # You should have received a copy of the GNU Affero General Public License | |
| 17 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 18 | |
| 19 | |
| 276 | 20 from functools import partial |
| 412 | 21 from pathlib import Path |
| 276 | 22 import sys |
| 412 | 23 import uuid |
|
448
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
24 import mimetypes |
| 425 | 25 from urllib.parse import urlparse |
| 78 | 26 from kivy.uix.boxlayout import BoxLayout |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
27 from kivy.uix.gridlayout import GridLayout |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
28 from kivy.uix.screenmanager import Screen, NoTransition |
| 22 | 29 from kivy.uix.textinput import TextInput |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
30 from kivy.uix.label import Label |
| 354 | 31 from kivy.uix import screenmanager |
|
367
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
32 from kivy.uix.behaviors import ButtonBehavior |
|
185
ab3f5173ef5c
chat, simple XHTML: font size adjustement
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
33 from kivy.metrics import sp, dp |
| 276 | 34 from kivy.clock import Clock |
| 22 | 35 from kivy import properties |
|
411
b018386653c2
chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents:
409
diff
changeset
|
36 from kivy.uix.stacklayout import StackLayout |
| 325 | 37 from kivy.uix.dropdown import DropDown |
| 38 from kivy.core.window import Window | |
| 39 from sat.core import log as logging | |
| 40 from sat.core.i18n import _ | |
| 41 from sat.core import exceptions | |
|
333
69d2a96ce26f
chat: serialise `options` in `fileUpload` following change in backend
Goffi <goffi@goffi.org>
parents:
332
diff
changeset
|
42 from sat.tools.common import data_format |
| 22 | 43 from sat_frontends.quick_frontend import quick_widgets |
| 44 from sat_frontends.quick_frontend import quick_chat | |
|
106
9909ed7a7a20
moved SimpleXHTMLWidget to a dedicated module
Goffi <goffi@goffi.org>
parents:
105
diff
changeset
|
45 from sat_frontends.tools import jid |
| 325 | 46 from cagou import G |
|
404
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
47 from ..core.constants import Const as C |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
48 from ..core import cagou_widget |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
49 from ..core import xmlui |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
50 from ..core.image import Image, AsyncImage |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
51 from ..core.common import Symbol, SymbolButton, JidButton, ContactButton |
|
404
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
52 from ..core.behaviors import FilterBehavior |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
53 from ..core import menu |
| 425 | 54 from ..core.common_widgets import ImagesGallery |
| 22 | 55 |
| 276 | 56 log = logging.getLogger(__name__) |
| 22 | 57 |
| 58 PLUGIN_INFO = { | |
| 312 | 59 "name": _("chat"), |
| 22 | 60 "main": "Chat", |
| 312 | 61 "description": _("instant messaging with one person or a group"), |
| 62 "icon_symbol": "chat", | |
| 22 | 63 } |
| 64 | |
|
244
5bd94bc08f5c
plugin chat: fixed OTR State filtering + removed some legacy code
Goffi <goffi@goffi.org>
parents:
242
diff
changeset
|
65 # FIXME: OTR specific code is legacy, and only used nowadays for lock color |
|
5bd94bc08f5c
plugin chat: fixed OTR State filtering + removed some legacy code
Goffi <goffi@goffi.org>
parents:
242
diff
changeset
|
66 # we can probably get rid of them. |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
67 OTR_STATE_UNTRUSTED = 'untrusted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
68 OTR_STATE_TRUSTED = 'trusted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
69 OTR_STATE_TRUST = (OTR_STATE_UNTRUSTED, OTR_STATE_TRUSTED) |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
70 OTR_STATE_UNENCRYPTED = 'unencrypted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
71 OTR_STATE_ENCRYPTED = 'encrypted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
72 OTR_STATE_ENCRYPTION = (OTR_STATE_UNENCRYPTED, OTR_STATE_ENCRYPTED) |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
73 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
74 SYMBOL_UNENCRYPTED = 'lock-open' |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
75 SYMBOL_ENCRYPTED = 'lock' |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
76 SYMBOL_ENCRYPTED_TRUSTED = 'lock-filled' |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
77 COLOR_UNENCRYPTED = (0.4, 0.4, 0.4, 1) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
78 COLOR_ENCRYPTED = (0.4, 0.4, 0.4, 1) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
79 COLOR_ENCRYPTED_TRUSTED = (0.29,0.87,0.0,1) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
80 |
| 326 | 81 # below this limit, new messages will be prepended |
| 82 INFINITE_SCROLL_LIMIT = dp(600) | |
| 83 | |
| 412 | 84 # File sending progress |
| 85 PROGRESS_UPDATE = 0.2 # number of seconds before next progress update | |
| 86 | |
| 22 | 87 |
|
411
b018386653c2
chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents:
409
diff
changeset
|
88 # FIXME: a ScrollLayout was supposed to be used here, but due |
|
b018386653c2
chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents:
409
diff
changeset
|
89 # to https://github.com/kivy/kivy/issues/6745, a StackLayout is used for now |
|
b018386653c2
chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents:
409
diff
changeset
|
90 class AttachmentsLayout(StackLayout): |
| 412 | 91 """Layout for attachments in a received message""" |
| 92 padding = properties.VariableListProperty([dp(5), dp(5), 0, dp(5)]) | |
| 93 attachments = properties.ObjectProperty() | |
| 94 | |
| 95 | |
| 96 class AttachmentsToSend(BoxLayout): | |
| 97 """Layout for attachments to be sent with current message""" | |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
98 attachments = properties.ObjectProperty() |
|
448
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
99 reduce_checkbox = properties.ObjectProperty() |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
100 show_resize = properties.BooleanProperty(False) |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
101 |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
102 def on_kv_post(self, __): |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
103 self.attachments.bind(children=self.onAttachment) |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
104 |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
105 def onAttachment(self, __, attachments): |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
106 if len(attachments) == 0: |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
107 self.show_resize = False |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
108 |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
109 |
| 425 | 110 class BaseAttachmentItem(BoxLayout): |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
111 data = properties.DictProperty() |
| 412 | 112 progress = properties.NumericProperty(0) |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
113 |
| 425 | 114 |
| 115 class AttachmentItem(BaseAttachmentItem): | |
| 116 | |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
117 def get_symbol(self, data): |
|
432
36c3f1c02d33
chat: renamed `MESS_KEY_MEDIA_TYPE` to `MESS_KEY_ATTACHMENTS_MEDIA_TYPE` following backend change
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
118 media_type = data.get(C.MESS_KEY_ATTACHMENTS_MEDIA_TYPE, '') |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
119 main_type = media_type.split('/', 1)[0] |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
120 if main_type == 'image': |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
121 return "file-image" |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
122 elif main_type == 'video': |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
123 return "file-video" |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
124 elif main_type == 'audio': |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
125 return "file-audio" |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
126 else: |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
127 return "doc" |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
128 |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
129 def on_press(self): |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
130 url = self.data.get('url') |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
131 if url: |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
132 G.local_platform.open_url(url, self) |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
133 else: |
| 412 | 134 log.warning(f"can't find URL in {self.data}") |
| 135 | |
| 136 | |
| 425 | 137 class AttachmentImageItem(ButtonBehavior, BaseAttachmentItem): |
| 138 image = properties.ObjectProperty() | |
| 139 | |
| 140 def on_press(self): | |
| 433 | 141 full_size_source = self.data.get('path', self.data.get('url')) |
| 142 gallery = ImagesGallery(sources=[full_size_source]) | |
| 425 | 143 G.host.showExtraUI(gallery) |
| 144 | |
|
446
ffdf2390ea56
chat: fixed `source` assignment for `AttachmentImageItem`
Goffi <goffi@goffi.org>
parents:
443
diff
changeset
|
145 def on_kv_post(self, __): |
|
ffdf2390ea56
chat: fixed `source` assignment for `AttachmentImageItem`
Goffi <goffi@goffi.org>
parents:
443
diff
changeset
|
146 self.on_data(None, self.data) |
|
ffdf2390ea56
chat: fixed `source` assignment for `AttachmentImageItem`
Goffi <goffi@goffi.org>
parents:
443
diff
changeset
|
147 |
|
437
b5e6d36fbf9c
chat: set AttachmentImageItem in python instead of kv:
Goffi <goffi@goffi.org>
parents:
435
diff
changeset
|
148 def on_data(self, __, data): |
|
446
ffdf2390ea56
chat: fixed `source` assignment for `AttachmentImageItem`
Goffi <goffi@goffi.org>
parents:
443
diff
changeset
|
149 if self.image is None: |
|
ffdf2390ea56
chat: fixed `source` assignment for `AttachmentImageItem`
Goffi <goffi@goffi.org>
parents:
443
diff
changeset
|
150 return |
|
437
b5e6d36fbf9c
chat: set AttachmentImageItem in python instead of kv:
Goffi <goffi@goffi.org>
parents:
435
diff
changeset
|
151 source = data.get('preview') or data.get('path') or data.get('url') |
|
b5e6d36fbf9c
chat: set AttachmentImageItem in python instead of kv:
Goffi <goffi@goffi.org>
parents:
435
diff
changeset
|
152 if source: |
|
446
ffdf2390ea56
chat: fixed `source` assignment for `AttachmentImageItem`
Goffi <goffi@goffi.org>
parents:
443
diff
changeset
|
153 self.image.source = source |
|
437
b5e6d36fbf9c
chat: set AttachmentImageItem in python instead of kv:
Goffi <goffi@goffi.org>
parents:
435
diff
changeset
|
154 |
| 425 | 155 |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
156 class AttachmentImagesCollectionItem(ButtonBehavior, GridLayout): |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
157 attachments = properties.ListProperty([]) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
158 chat = properties.ObjectProperty() |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
159 mess_data = properties.ObjectProperty() |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
160 |
| 433 | 161 def _setPreview(self, attachment, wid, preview_path): |
| 162 attachment['preview'] = preview_path | |
| 163 wid.source = preview_path | |
| 164 | |
|
435
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
165 def _setPath(self, attachment, wid, path): |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
166 attachment['path'] = path |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
167 if wid is not None: |
| 433 | 168 # we also need a preview for the widget |
| 169 if 'preview' in attachment: | |
| 170 wid.source = attachment['preview'] | |
| 171 else: | |
| 172 G.host.bridge.imageGeneratePreview( | |
| 173 path, | |
| 174 self.chat.profile, | |
| 175 callback=partial(self._setPreview, attachment, wid), | |
| 176 ) | |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
177 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
178 def on_kv_post(self, __): |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
179 attachments = self.attachments |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
180 self.clear_widgets() |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
181 for idx, attachment in enumerate(attachments): |
|
443
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
182 try: |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
183 url = attachment['url'] |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
184 except KeyError: |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
185 url = None |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
186 to_download = False |
|
435
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
187 else: |
|
443
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
188 if url.startswith("aesgcm:"): |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
189 del attachment['url'] |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
190 # if the file is encrypted, we need to download it for decryption |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
191 to_download = True |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
192 else: |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
193 to_download = False |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
194 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
195 if idx < 3 or len(attachments) <= 4: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
196 if ((self.mess_data.own_mess |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
197 or self.chat.contact_list.isInRoster(self.mess_data.from_jid))): |
|
441
ff548846df91
chat: use `image-loading` as source by default:
Goffi <goffi@goffi.org>
parents:
437
diff
changeset
|
198 wid = AsyncImage(size_hint=(1, 1), source="data/images/image-loading.gif") |
|
435
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
199 if 'preview' in attachment: |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
200 wid.source = attachment["preview"] |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
201 elif 'path' in attachment: |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
202 G.host.bridge.imageGeneratePreview( |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
203 attachment['path'], |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
204 self.chat.profile, |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
205 callback=partial(self._setPreview, attachment, wid), |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
206 ) |
|
443
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
207 elif url is None: |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
208 log.warning(f"Can't find any source for {attachment}") |
|
435
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
209 else: |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
210 # we'll download the file, the preview will then be generated |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
211 to_download = True |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
212 else: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
213 # we don't download automatically the image if the contact is not |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
214 # in roster, to avoid leaking the ip |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
215 wid = Symbol(symbol="file-image") |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
216 self.add_widget(wid) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
217 else: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
218 wid = None |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
219 |
|
435
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
220 if to_download: |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
221 # the file needs to be downloaded, the widget source, |
|
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
222 # attachment path, and preview will then be completed |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
223 G.host.downloadURL( |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
224 url, |
|
435
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
225 callback=partial(self._setPath, attachment, wid), |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
226 dest=C.FILE_DEST_CACHE, |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
227 profile=self.chat.profile, |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
228 ) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
229 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
230 if len(attachments) > 4: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
231 counter = Label( |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
232 bold=True, |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
233 text=f"+{len(attachments) - 3}", |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
234 ) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
235 self.add_widget(counter) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
236 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
237 def on_press(self): |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
238 sources = [] |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
239 for attachment in self.attachments: |
|
435
53bb3886b408
chat: generate preview if there is not one already for non encrypted attachments
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
240 source = attachment.get('path') or attachment.get('url') |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
241 if not source: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
242 log.warning(f"no source for {attachment}") |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
243 else: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
244 sources.append(source) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
245 gallery = ImagesGallery(sources=sources) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
246 G.host.showExtraUI(gallery) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
247 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
248 |
| 412 | 249 class AttachmentToSendItem(AttachmentItem): |
| 250 # True when the item is being sent | |
| 251 sending = properties.BooleanProperty(False) | |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
252 |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
253 |
|
367
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
254 class MessAvatar(ButtonBehavior, Image): |
|
44
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
255 pass |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
256 |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
257 |
| 325 | 258 class MessageWidget(quick_chat.MessageWidget, BoxLayout): |
| 22 | 259 mess_data = properties.ObjectProperty() |
| 57 | 260 mess_xhtml = properties.ObjectProperty() |
| 45 | 261 mess_padding = (dp(5), dp(5)) |
|
47
abb81efef3bb
chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents:
46
diff
changeset
|
262 avatar = properties.ObjectProperty() |
|
103
c601e3d40342
chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents:
102
diff
changeset
|
263 delivery = properties.ObjectProperty() |
|
185
ab3f5173ef5c
chat, simple XHTML: font size adjustement
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
264 font_size = properties.NumericProperty(sp(12)) |
| 325 | 265 right_part = properties.ObjectProperty() |
| 266 header_box = properties.ObjectProperty() | |
|
47
abb81efef3bb
chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents:
46
diff
changeset
|
267 |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
268 def on_kv_post(self, __): |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
269 if not self.mess_data: |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
270 raise exceptions.InternalError( |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
271 "mess_data must always be set in MessageWidget") |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
272 |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
273 self.mess_data.widgets.add(self) |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
274 self.add_attachments() |
|
44
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
275 |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
276 @property |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
277 def chat(self): |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
278 """return parent Chat instance""" |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
279 return self.mess_data.parent |
| 22 | 280 |
| 325 | 281 def _get_from_mess_data(self, name, default): |
| 282 if self.mess_data is None: | |
| 283 return default | |
| 284 return getattr(self.mess_data, name) | |
| 285 | |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
286 def _get_message(self): |
| 22 | 287 """Return currently displayed message""" |
| 325 | 288 if self.mess_data is None: |
| 289 return "" | |
| 22 | 290 return self.mess_data.main_message |
| 291 | |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
292 def _set_message(self, message): |
| 325 | 293 if self.mess_data is None: |
| 294 return False | |
| 312 | 295 if message == self.mess_data.message.get(""): |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
296 return False |
| 312 | 297 self.mess_data.message = {"": message} |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
298 return True |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
299 |
| 325 | 300 message = properties.AliasProperty( |
| 301 partial(_get_from_mess_data, name="main_message", default=""), | |
| 302 _set_message, | |
| 303 bind=['mess_data'], | |
| 304 ) | |
| 305 message_xhtml = properties.AliasProperty( | |
| 306 partial(_get_from_mess_data, name="main_message_xhtml", default=""), | |
| 307 bind=['mess_data']) | |
| 308 mess_type = properties.AliasProperty( | |
| 309 partial(_get_from_mess_data, name="type", default=""), bind=['mess_data']) | |
| 310 own_mess = properties.AliasProperty( | |
| 311 partial(_get_from_mess_data, name="own_mess", default=False), bind=['mess_data']) | |
| 312 nick = properties.AliasProperty( | |
| 313 partial(_get_from_mess_data, name="nick", default=""), bind=['mess_data']) | |
| 314 time_text = properties.AliasProperty( | |
| 315 partial(_get_from_mess_data, name="time_text", default=""), bind=['mess_data']) | |
| 57 | 316 |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
317 @property |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
318 def info_type(self): |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
319 return self.mess_data.info_type |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
320 |
|
54
514c187afebc
chat: changed udpate to use dict instead of single key/value
Goffi <goffi@goffi.org>
parents:
47
diff
changeset
|
321 def update(self, update_dict): |
|
514c187afebc
chat: changed udpate to use dict instead of single key/value
Goffi <goffi@goffi.org>
parents:
47
diff
changeset
|
322 if 'avatar' in update_dict: |
|
458
1dd6db69406a
core: update avatar handling following backend changes:
Goffi <goffi@goffi.org>
parents:
455
diff
changeset
|
323 avatar_data = update_dict['avatar'] |
|
1dd6db69406a
core: update avatar handling following backend changes:
Goffi <goffi@goffi.org>
parents:
455
diff
changeset
|
324 if avatar_data is None: |
|
1dd6db69406a
core: update avatar handling following backend changes:
Goffi <goffi@goffi.org>
parents:
455
diff
changeset
|
325 source = G.host.getDefaultAvatar() |
|
1dd6db69406a
core: update avatar handling following backend changes:
Goffi <goffi@goffi.org>
parents:
455
diff
changeset
|
326 else: |
|
1dd6db69406a
core: update avatar handling following backend changes:
Goffi <goffi@goffi.org>
parents:
455
diff
changeset
|
327 source = avatar_data['path'] |
|
1dd6db69406a
core: update avatar handling following backend changes:
Goffi <goffi@goffi.org>
parents:
455
diff
changeset
|
328 self.avatar.source = source |
|
103
c601e3d40342
chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents:
102
diff
changeset
|
329 if 'status' in update_dict: |
|
c601e3d40342
chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents:
102
diff
changeset
|
330 status = update_dict['status'] |
| 312 | 331 self.delivery.text = '\u2714' if status == 'delivered' else '' |
|
47
abb81efef3bb
chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents:
46
diff
changeset
|
332 |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
333 def _setPath(self, data, path): |
| 425 | 334 """Set path of decrypted file to an item""" |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
335 data['path'] = path |
| 425 | 336 |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
337 def add_attachments(self): |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
338 """Add attachments layout + attachments item""" |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
339 attachments = self.mess_data.attachments |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
340 if not attachments: |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
341 return |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
342 root_layout = AttachmentsLayout() |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
343 self.right_part.add_widget(root_layout) |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
344 layout = root_layout.attachments |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
345 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
346 image_attachments = [] |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
347 other_attachments = [] |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
348 # we first separate images and other attachments, so we know if we need |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
349 # to use an image collection |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
350 for attachment in attachments: |
|
432
36c3f1c02d33
chat: renamed `MESS_KEY_MEDIA_TYPE` to `MESS_KEY_ATTACHMENTS_MEDIA_TYPE` following backend change
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
351 media_type = attachment.get(C.MESS_KEY_ATTACHMENTS_MEDIA_TYPE, '') |
| 425 | 352 main_type = media_type.split('/', 1)[0] |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
353 # GIF images are really badly handled by Kivy, the memory |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
354 # consumption explode, and the images frequencies are not handled |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
355 # correctly, thus we can't display them and we consider them as |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
356 # other attachment, so user can open the item with appropriate |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
357 # software. |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
358 if main_type == 'image' and media_type != "image/gif": |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
359 image_attachments.append(attachment) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
360 else: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
361 other_attachments.append(attachment) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
362 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
363 if len(image_attachments) > 1: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
364 collection = AttachmentImagesCollectionItem( |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
365 attachments=image_attachments, |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
366 chat=self.chat, |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
367 mess_data=self.mess_data, |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
368 ) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
369 layout.add_widget(collection) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
370 elif image_attachments: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
371 attachment = image_attachments[0] |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
372 # to avoid leaking IP address, we only display image if the contact is in |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
373 # roster |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
374 if ((self.mess_data.own_mess |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
375 or self.chat.contact_list.isInRoster(self.mess_data.from_jid))): |
|
443
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
376 try: |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
377 url = urlparse(attachment['url']) |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
378 except KeyError: |
| 425 | 379 item = AttachmentImageItem(data=attachment) |
| 380 else: | |
|
443
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
381 if url.scheme == "aesgcm": |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
382 # we remove the URL now, we'll replace it by |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
383 # the local decrypted version |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
384 del attachment['url'] |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
385 item = AttachmentImageItem(data=attachment) |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
386 G.host.downloadURL( |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
387 url.geturl(), |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
388 callback=partial(self._setPath, item.data), |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
389 dest=C.FILE_DEST_CACHE, |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
390 profile=self.chat.profile, |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
391 ) |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
392 else: |
|
61322ff8090b
chat: fixed handling of attachments without URL
Goffi <goffi@goffi.org>
parents:
442
diff
changeset
|
393 item = AttachmentImageItem(data=attachment) |
| 425 | 394 else: |
| 395 item = AttachmentItem(data=attachment) | |
|
426
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
396 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
397 layout.add_widget(item) |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
398 |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
399 for attachment in other_attachments: |
|
d3a6ae859556
chat: image attachments collection, first draft:
Goffi <goffi@goffi.org>
parents:
425
diff
changeset
|
400 item = AttachmentItem(data=attachment) |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
401 layout.add_widget(item) |
|
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
402 |
| 22 | 403 |
| 78 | 404 class MessageInputBox(BoxLayout): |
| 276 | 405 message_input = properties.ObjectProperty() |
| 406 | |
| 407 def send_text(self): | |
| 408 self.message_input.send_text() | |
| 78 | 409 |
| 410 | |
| 22 | 411 class MessageInputWidget(TextInput): |
| 412 | |
| 276 | 413 def keyboard_on_key_down(self, window, keycode, text, modifiers): |
| 414 # We don't send text when shift is pressed to be able to add line feeds | |
| 415 # (i.e. multi-lines messages). We don't send on Android either as the | |
| 416 # send button appears on this platform. | |
| 417 if (keycode[-1] == "enter" | |
| 418 and "shift" not in modifiers | |
| 419 and sys.platform != 'android'): | |
| 420 self.send_text() | |
| 22 | 421 else: |
| 276 | 422 return super(MessageInputWidget, self).keyboard_on_key_down( |
| 423 window, keycode, text, modifiers) | |
| 424 | |
| 425 def send_text(self): | |
| 426 self.dispatch('on_text_validate') | |
| 22 | 427 |
| 428 | |
|
278
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
429 class TransferButton(SymbolButton): |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
430 chat = properties.ObjectProperty() |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
431 |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
432 def on_release(self, *args): |
|
417
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
433 menu.TransferMenu( |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
434 encrypted=self.chat.encrypted, |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
435 callback=self.chat.transferFile, |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
436 ).show(self) |
|
278
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
437 |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
438 |
|
287
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
439 class ExtraMenu(DropDown): |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
440 chat = properties.ObjectProperty() |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
441 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
442 def on_select(self, menu): |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
443 if menu == 'bookmark': |
| 312 | 444 G.host.bridge.menuLaunch(C.MENU_GLOBAL, ("groups", "bookmarks"), |
|
287
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
445 {}, C.NO_SECURITY_LIMIT, self.chat.profile, |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
446 callback=partial( |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
447 G.host.actionManager, profile=self.chat.profile), |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
448 errback=G.host.errback) |
|
393
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
449 elif menu == 'close': |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
450 if self.chat.type == C.CHAT_GROUP: |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
451 # for MUC, we have to indicate the backend that we've left |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
452 G.host.bridge.mucLeave(self.chat.target, self.chat.profile) |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
453 else: |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
454 # for one2one, backend doesn't keep any state, so we just delete the |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
455 # widget here in the frontend |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
456 G.host.widgets.deleteWidget( |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
457 self.chat, all_instances=True, explicit_close=True) |
|
287
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
458 else: |
| 312 | 459 raise exceptions.InternalError("Unknown menu: {}".format(menu)) |
|
287
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
460 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
461 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
462 class ExtraButton(SymbolButton): |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
463 chat = properties.ObjectProperty() |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
464 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
465 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
466 class EncryptionMainButton(SymbolButton): |
| 117 | 467 |
| 468 def __init__(self, chat, **kwargs): | |
| 469 """ | |
| 470 @param chat(Chat): Chat instance | |
| 471 """ | |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
472 self.chat = chat |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
473 self.encryption_menu = EncryptionMenu(chat) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
474 super(EncryptionMainButton, self).__init__(**kwargs) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
475 self.bind(on_release=self.encryption_menu.open) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
476 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
477 def selectAlgo(self, name): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
478 """Mark an encryption algorithm as selected. |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
479 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
480 This will also deselect all other button |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
481 @param name(unicode, None): encryption plugin name |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
482 None for plain text |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
483 """ |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
484 buttons = self.encryption_menu.container.children |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
485 buttons[-1].selected = name is None |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
486 for button in buttons[:-1]: |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
487 button.selected = button.text == name |
| 117 | 488 |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
489 def getColor(self): |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
490 if self.chat.otr_state_encryption == OTR_STATE_UNENCRYPTED: |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
491 return (0.4, 0.4, 0.4, 1) |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
492 elif self.chat.otr_state_trust == OTR_STATE_TRUSTED: |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
493 return (0.29,0.87,0.0,1) |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
494 else: |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
495 return (0.4, 0.4, 0.4, 1) |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
496 |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
497 def getSymbol(self): |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
498 if self.chat.otr_state_encryption == OTR_STATE_UNENCRYPTED: |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
499 return 'lock-open' |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
500 elif self.chat.otr_state_trust == OTR_STATE_TRUSTED: |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
501 return 'lock-filled' |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
502 else: |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
503 return 'lock' |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
504 |
| 117 | 505 |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
506 class TrustManagementButton(SymbolButton): |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
507 pass |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
508 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
509 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
510 class EncryptionButton(BoxLayout): |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
511 selected = properties.BooleanProperty(False) |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
512 text = properties.StringProperty() |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
513 trust_button = properties.BooleanProperty(False) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
514 best_width = properties.NumericProperty(0) |
| 312 | 515 bold = properties.BooleanProperty(True) |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
516 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
517 def __init__(self, **kwargs): |
| 312 | 518 super(EncryptionButton, self).__init__(**kwargs) |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
519 self.register_event_type('on_release') |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
520 self.register_event_type('on_trust_release') |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
521 if self.trust_button: |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
522 self.add_widget(TrustManagementButton()) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
523 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
524 def on_release(self): |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
525 pass |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
526 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
527 def on_trust_release(self): |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
528 pass |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
529 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
530 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
531 class EncryptionMenu(DropDown): |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
532 # best with to display all algorithms buttons + trust buttons |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
533 best_width = properties.NumericProperty(0) |
| 117 | 534 |
| 535 def __init__(self, chat, **kwargs): | |
| 536 """ | |
| 537 @param chat(Chat): Chat instance | |
| 538 """ | |
| 539 self.chat = chat | |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
540 super(EncryptionMenu, self).__init__(**kwargs) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
541 btn = EncryptionButton( |
| 312 | 542 text=_("unencrypted (plain text)"), |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
543 on_release=self.unencrypted, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
544 selected=True, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
545 bold=False, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
546 ) |
|
332
13bc00b9743a
chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents:
329
diff
changeset
|
547 btn.bind( |
|
13bc00b9743a
chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents:
329
diff
changeset
|
548 on_release=self.unencrypted, |
|
13bc00b9743a
chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents:
329
diff
changeset
|
549 ) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
550 self.add_widget(btn) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
551 for plugin in G.host.encryption_plugins: |
|
339
63cdabdd032e
chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents:
338
diff
changeset
|
552 if chat.type == C.CHAT_GROUP and plugin["directed"]: |
|
63cdabdd032e
chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents:
338
diff
changeset
|
553 # directed plugins can't work with group chat |
|
63cdabdd032e
chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents:
338
diff
changeset
|
554 continue |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
555 btn = EncryptionButton( |
| 312 | 556 text=plugin['name'], |
|
332
13bc00b9743a
chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents:
329
diff
changeset
|
557 trust_button=True, |
|
13bc00b9743a
chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents:
329
diff
changeset
|
558 ) |
|
13bc00b9743a
chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents:
329
diff
changeset
|
559 btn.bind( |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
560 on_release=partial(self.startEncryption, plugin=plugin), |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
561 on_trust_release=partial(self.getTrustUI, plugin=plugin), |
|
332
13bc00b9743a
chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents:
329
diff
changeset
|
562 ) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
563 self.add_widget(btn) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
564 log.info("added encryption: {}".format(plugin['name'])) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
565 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
566 def messageEncryptionStopCb(self): |
| 312 | 567 log.info(_("Session with {destinee} is now in plain text").format( |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
568 destinee = self.chat.target)) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
569 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
570 def messageEncryptionStopEb(self, failure_): |
| 312 | 571 msg = _("Error while stopping encryption with {destinee}: {reason}").format( |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
572 destinee = self.chat.target, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
573 reason = failure_) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
574 log.warning(msg) |
| 312 | 575 G.host.addNote(_("encryption problem"), msg, C.XMLUI_DATA_LVL_ERROR) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
576 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
577 def unencrypted(self, button): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
578 self.dismiss() |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
579 G.host.bridge.messageEncryptionStop( |
| 312 | 580 str(self.chat.target), |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
581 self.chat.profile, |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
582 callback=self.messageEncryptionStopCb, |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
583 errback=self.messageEncryptionStopEb) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
584 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
585 def messageEncryptionStartCb(self, plugin): |
| 312 | 586 log.info(_("Session with {destinee} is now encrypted with {encr_name}").format( |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
587 destinee = self.chat.target, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
588 encr_name = plugin['name'])) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
589 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
590 def messageEncryptionStartEb(self, failure_): |
| 312 | 591 msg = _("Session can't be encrypted with {destinee}: {reason}").format( |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
592 destinee = self.chat.target, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
593 reason = failure_) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
594 log.warning(msg) |
| 312 | 595 G.host.addNote(_("encryption problem"), msg, C.XMLUI_DATA_LVL_ERROR) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
596 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
597 def startEncryption(self, button, plugin): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
598 """Request encryption with given plugin for this session |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
599 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
600 @param button(EncryptionButton): button which has been pressed |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
601 @param plugin(dict): plugin data |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
602 """ |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
603 self.dismiss() |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
604 G.host.bridge.messageEncryptionStart( |
| 312 | 605 str(self.chat.target), |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
606 plugin['namespace'], |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
607 True, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
608 self.chat.profile, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
609 callback=partial(self.messageEncryptionStartCb, plugin=plugin), |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
610 errback=self.messageEncryptionStartEb) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
611 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
612 def encryptionTrustUIGetCb(self, xmlui_raw): |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
613 xml_ui = xmlui.create( |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
614 G.host, xmlui_raw, profile=self.chat.profile) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
615 xml_ui.show() |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
616 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
617 def encryptionTrustUIGetEb(self, failure_): |
| 312 | 618 msg = _("Trust manager interface can't be retrieved: {reason}").format( |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
619 reason = failure_) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
620 log.warning(msg) |
| 312 | 621 G.host.addNote(_("encryption trust management problem"), msg, |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
622 C.XMLUI_DATA_LVL_ERROR) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
623 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
624 def getTrustUI(self, button, plugin): |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
625 """Request and display trust management UI |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
626 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
627 @param button(EncryptionButton): button which has been pressed |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
628 @param plugin(dict): plugin data |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
629 """ |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
630 self.dismiss() |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
631 G.host.bridge.encryptionTrustUIGet( |
| 312 | 632 str(self.chat.target), |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
633 plugin['namespace'], |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
634 self.chat.profile, |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
635 callback=self.encryptionTrustUIGetCb, |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
636 errback=self.encryptionTrustUIGetEb) |
| 117 | 637 |
| 638 | |
| 22 | 639 class Chat(quick_chat.QuickChat, cagou_widget.CagouWidget): |
| 78 | 640 message_input = properties.ObjectProperty() |
| 86 | 641 messages_widget = properties.ObjectProperty() |
| 326 | 642 history_scroll = properties.ObjectProperty() |
| 412 | 643 attachments_to_send = properties.ObjectProperty() |
|
413
c466678c57b2
chat: control send button visibility in core.platform_, and show it when there are attachments
Goffi <goffi@goffi.org>
parents:
412
diff
changeset
|
644 send_button_visible = properties.BooleanProperty() |
|
387
d61bbbac4160
cagou widget: don't add header_input systematically anymore:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
645 use_header_input = True |
| 354 | 646 global_screen_manager = True |
|
353
19422bbd9c8e
core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents:
340
diff
changeset
|
647 collection_carousel = True |
| 22 | 648 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
649 def __init__(self, host, target, type_=C.CHAT_ONE2ONE, nick=None, occupants=None, |
|
338
d4883f9576db
chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents:
334
diff
changeset
|
650 subject=None, statuses=None, profiles=None): |
| 354 | 651 self.show_chat_selector = False |
|
353
19422bbd9c8e
core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents:
340
diff
changeset
|
652 if statuses is None: |
|
19422bbd9c8e
core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents:
340
diff
changeset
|
653 statuses = {} |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
654 quick_chat.QuickChat.__init__( |
|
338
d4883f9576db
chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents:
334
diff
changeset
|
655 self, host, target, type_, nick, occupants, subject, statuses, |
|
d4883f9576db
chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents:
334
diff
changeset
|
656 profiles=profiles) |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
657 self.otr_state_encryption = OTR_STATE_UNENCRYPTED |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
658 self.otr_state_trust = OTR_STATE_UNTRUSTED |
|
225
a3162b29cda1
plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents:
193
diff
changeset
|
659 # completion attributes |
|
a3162b29cda1
plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents:
193
diff
changeset
|
660 self._hi_comp_data = None |
|
a3162b29cda1
plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents:
193
diff
changeset
|
661 self._hi_comp_last = None |
|
a3162b29cda1
plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents:
193
diff
changeset
|
662 self._hi_comp_dropdown = DropDown() |
|
a3162b29cda1
plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents:
193
diff
changeset
|
663 self._hi_comp_allowed = True |
| 22 | 664 cagou_widget.CagouWidget.__init__(self) |
|
278
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
665 transfer_btn = TransferButton(chat=self) |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
666 self.headerInputAddExtra(transfer_btn) |
|
339
63cdabdd032e
chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents:
338
diff
changeset
|
667 if (type_ == C.CHAT_ONE2ONE or "REALJID_PUBLIC" in statuses): |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
668 self.encryption_btn = EncryptionMainButton(self) |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
669 self.headerInputAddExtra(self.encryption_btn) |
|
287
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
670 self.extra_menu = ExtraMenu(chat=self) |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
671 extra_btn = ExtraButton(chat=self) |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
672 self.headerInputAddExtra(extra_btn) |
| 325 | 673 self.header_input.hint_text = target |
| 326 | 674 self._history_prepend_lock = False |
| 675 self.history_count = 0 | |
| 22 | 676 |
|
353
19422bbd9c8e
core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents:
340
diff
changeset
|
677 def on_kv_post(self, __): |
|
19422bbd9c8e
core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents:
340
diff
changeset
|
678 self.postInit() |
|
19422bbd9c8e
core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents:
340
diff
changeset
|
679 |
| 354 | 680 def screenManagerInit(self, screen_manager): |
| 681 screen_manager.transition = screenmanager.SlideTransition(direction='down') | |
| 682 sel_screen = Screen(name='chat_selector') | |
| 683 chat_selector = ChatSelector(profile=self.profile) | |
| 684 sel_screen.add_widget(chat_selector) | |
| 685 screen_manager.add_widget(sel_screen) | |
| 686 if self.show_chat_selector: | |
| 687 transition = screen_manager.transition | |
| 688 screen_manager.transition = NoTransition() | |
| 689 screen_manager.current = 'chat_selector' | |
| 690 screen_manager.transition = transition | |
| 691 | |
|
156
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
692 def __str__(self): |
| 312 | 693 return "Chat({})".format(self.target) |
|
156
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
694 |
|
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
695 def __repr__(self): |
|
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
696 return self.__str__() |
|
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
697 |
| 22 | 698 @classmethod |
| 699 def factory(cls, plugin_info, target, profiles): | |
| 700 profiles = list(profiles) | |
| 701 if len(profiles) > 1: | |
| 312 | 702 raise NotImplementedError("Multi-profiles is not available yet for chat") |
| 22 | 703 if target is None: |
| 354 | 704 show_chat_selector = True |
| 22 | 705 target = G.host.profiles[profiles[0]].whoami |
| 354 | 706 else: |
| 707 show_chat_selector = False | |
| 708 wid = G.host.widgets.getOrCreateWidget(cls, target, on_new_widget=None, | |
| 709 on_existing_widget=G.host.getOrClone, | |
| 710 profiles=profiles) | |
| 711 wid.show_chat_selector = show_chat_selector | |
| 712 return wid | |
| 22 | 713 |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
714 @property |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
715 def message_widgets_rev(self): |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
716 return self.messages_widget.children |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
717 |
| 354 | 718 ## keyboard ## |
|
367
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
719 |
| 354 | 720 def key_input(self, window, key, scancode, codepoint, modifier): |
| 721 if key == 27: | |
| 722 screen_manager = self.screen_manager | |
| 723 screen_manager.transition.direction = 'down' | |
| 724 screen_manager.current = 'chat_selector' | |
| 725 return True | |
| 726 | |
| 414 | 727 ## drop ## |
| 728 | |
| 729 def on_drop_file(self, path): | |
| 730 self.addAttachment(path) | |
| 354 | 731 |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
732 ## header ## |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
733 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
734 def changeWidget(self, jid_): |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
735 """change current widget for a new one with given jid |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
736 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
737 @param jid_(jid.JID): jid of the widget to create |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
738 """ |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
739 plugin_info = G.host.getPluginInfo(main=Chat) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
740 factory = plugin_info['factory'] |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
741 G.host.switchWidget(self, factory(plugin_info, jid_, profiles=[self.profile])) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
742 self.header_input.text = '' |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
743 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
744 def onHeaderInput(self): |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
745 text = self.header_input.text.strip() |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
746 try: |
| 312 | 747 if text.count('@') != 1 or text.count(' '): |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
748 raise ValueError |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
749 jid_ = jid.JID(text) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
750 except ValueError: |
| 312 | 751 log.info("entered text is not a jid") |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
752 return |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
753 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
754 def discoCb(disco): |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
755 # TODO: check if plugin XEP-0045 is activated |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
756 if "conference" in [i[0] for i in disco[1]]: |
| 312 | 757 G.host.bridge.mucJoin(str(jid_), "", "", self.profile, |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
758 callback=self._mucJoinCb, errback=self._mucJoinEb) |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
759 else: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
760 self.changeWidget(jid_) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
761 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
762 def discoEb(failure): |
| 312 | 763 log.warning("Disco failure, ignore this text: {}".format(failure)) |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
764 |
| 442 | 765 G.host.bridge.discoInfos( |
| 766 jid_.domain, | |
| 767 profile_key=self.profile, | |
| 768 callback=discoCb, | |
| 769 errback=discoEb) | |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
770 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
771 def onHeaderInputCompleted(self, input_wid, completed_text): |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
772 self._hi_comp_allowed = False |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
773 input_wid.text = completed_text |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
774 self._hi_comp_allowed = True |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
775 self._hi_comp_dropdown.dismiss() |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
776 self.onHeaderInput() |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
777 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
778 def onHeaderInputComplete(self, wid, text): |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
779 if not self._hi_comp_allowed: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
780 return |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
781 text = text.lstrip() |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
782 if not text: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
783 self._hi_comp_data = None |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
784 self._hi_comp_last = None |
| 144 | 785 self._hi_comp_dropdown.dismiss() |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
786 return |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
787 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
788 profile = list(self.profiles)[0] |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
789 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
790 if self._hi_comp_data is None: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
791 # first completion, we build the initial list |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
792 comp_data = self._hi_comp_data = [] |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
793 self._hi_comp_last = '' |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
794 for jid_, jid_data in G.host.contact_lists[profile].all_iter: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
795 comp_data.append((jid_, jid_data)) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
796 comp_data.sort(key=lambda datum: datum[0]) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
797 else: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
798 comp_data = self._hi_comp_data |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
799 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
800 # XXX: dropdown is rebuilt each time backspace is pressed or if the text is changed, |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
801 # it works OK, but some optimisation may be done here |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
802 dropdown = self._hi_comp_dropdown |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
803 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
804 if not text.startswith(self._hi_comp_last) or not self._hi_comp_last: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
805 # text has changed or backspace has been pressed, we restart |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
806 dropdown.clear_widgets() |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
807 |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
808 for jid_, jid_data in comp_data: |
| 312 | 809 nick = jid_data.get('nick', '') |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
810 if text in jid_.bare or text in nick.lower(): |
|
193
284cb5c467b0
core (common): split JidItem in 3 classes:
Goffi <goffi@goffi.org>
parents:
186
diff
changeset
|
811 btn = JidButton( |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
812 jid = jid_.bare, |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
813 profile = profile, |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
814 size_hint = (0.5, None), |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
815 nick = nick, |
| 284 | 816 on_release=lambda __, txt=jid_.bare: self.onHeaderInputCompleted(wid, txt) |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
817 ) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
818 dropdown.add_widget(btn) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
819 else: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
820 # more chars, we continue completion by removing unwanted widgets |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
821 to_remove = [] |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
822 for c in dropdown.children[0].children: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
823 if text not in c.jid and text not in (c.nick or ''): |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
824 to_remove.append(c) |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
825 for c in to_remove: |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
826 dropdown.remove_widget(c) |
| 144 | 827 if dropdown.attach_to is None: |
| 828 dropdown.open(wid) | |
|
109
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
829 self._hi_comp_last = text |
|
7631325e11f4
chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents:
106
diff
changeset
|
830 |
| 22 | 831 def messageDataConverter(self, idx, mess_id): |
| 832 return {"mess_data": self.messages[mess_id]} | |
| 833 | |
| 834 def _onHistoryPrinted(self): | |
| 835 """Refresh or scroll down the focus after the history is printed""" | |
| 836 # self.adapter.data = self.messages | |
| 312 | 837 for mess_data in self.messages.values(): |
| 22 | 838 self.appendMessage(mess_data) |
| 839 super(Chat, self)._onHistoryPrinted() | |
| 840 | |
| 841 def createMessage(self, message): | |
| 842 self.appendMessage(message) | |
|
329
51520ce98154
common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
Goffi <goffi@goffi.org>
parents:
326
diff
changeset
|
843 # we need to render immediatly next 2 layouts to avoid an unpleasant flickering |
|
51520ce98154
common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
Goffi <goffi@goffi.org>
parents:
326
diff
changeset
|
844 # when sending or receiving a message |
|
51520ce98154
common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
Goffi <goffi@goffi.org>
parents:
326
diff
changeset
|
845 self.messages_widget.dont_delay_next_layouts = 2 |
| 22 | 846 |
| 847 def appendMessage(self, mess_data): | |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
848 """Append a message Widget to the history |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
849 |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
850 @param mess_data(quick_chat.Message): message data |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
851 """ |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
852 if self.handleUserMoved(mess_data): |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
853 return |
| 22 | 854 self.messages_widget.add_widget(MessageWidget(mess_data=mess_data)) |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
855 self.notify(mess_data) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
856 |
| 326 | 857 def prependMessage(self, mess_data): |
| 858 """Prepend a message Widget to the history | |
| 859 | |
| 860 @param mess_data(quick_chat.Message): message data | |
| 861 """ | |
| 862 mess_wid = self.messages_widget | |
| 863 last_idx = len(mess_wid.children) | |
| 864 mess_wid.add_widget(MessageWidget(mess_data=mess_data), index=last_idx) | |
| 865 | |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
866 def _get_notif_msg(self, mess_data): |
| 312 | 867 return _("{nick}: {message}").format( |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
868 nick=mess_data.nick, |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
869 message=mess_data.main_message) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
870 |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
871 def notify(self, mess_data): |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
872 """Notify user when suitable |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
873 |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
874 For one2one chat, notification will happen when window has not focus |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
875 or when one2one chat is not visible. A note is also there when widget |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
876 is not visible. |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
877 For group chat, note will be added on mention, with a desktop notification if |
|
396
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
878 window has not focus or is not visible. |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
879 """ |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
880 visible_clones = [w for w in G.host.getVisibleList(self.__class__) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
881 if w.target == self.target] |
|
186
a826c70beda2
chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents:
185
diff
changeset
|
882 if len(visible_clones) > 1 and visible_clones.index(self) > 0: |
|
a826c70beda2
chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents:
185
diff
changeset
|
883 # to avoid multiple notifications in case of multiple cloned widgets |
|
a826c70beda2
chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents:
185
diff
changeset
|
884 # we only handle first clone |
|
a826c70beda2
chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents:
185
diff
changeset
|
885 return |
|
a826c70beda2
chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents:
185
diff
changeset
|
886 is_visible = bool(visible_clones) |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
887 if self.type == C.CHAT_ONE2ONE: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
888 if (not Window.focus or not is_visible) and not mess_data.history: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
889 notif_msg = self._get_notif_msg(mess_data) |
|
396
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
890 G.host.notify( |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
891 type_=C.NOTIFY_MESSAGE, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
892 entity=mess_data.from_jid, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
893 message=notif_msg, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
894 subject=_("private message"), |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
895 widget=self, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
896 profile=self.profile |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
897 ) |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
898 if not is_visible: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
899 G.host.addNote( |
| 312 | 900 _("private message"), |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
901 notif_msg, |
| 312 | 902 symbol = "chat", |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
903 action = { |
| 312 | 904 "action": 'chat', |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
905 "target": self.target, |
|
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
906 "profiles": self.profiles} |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
907 ) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
908 else: |
|
396
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
909 if mess_data.mention: |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
910 notif_msg = self._get_notif_msg(mess_data) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
911 G.host.addNote( |
| 312 | 912 _("mention"), |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
913 notif_msg, |
| 312 | 914 symbol = "chat", |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
915 action = { |
| 312 | 916 "action": 'chat', |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
917 "target": self.target, |
|
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
918 "profiles": self.profiles} |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
919 ) |
|
396
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
920 if not is_visible or not Window.focus: |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
921 subject=_("mention ({room_jid})").format(room_jid=self.target) |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
922 G.host.notify( |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
923 type_=C.NOTIFY_MENTION, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
924 entity=self.target, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
925 message=notif_msg, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
926 subject=subject, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
927 widget=self, |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
928 profile=self.profile |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
929 ) |
| 22 | 930 |
|
367
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
931 # message input |
|
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
932 |
| 412 | 933 def _attachmentProgressCb(self, item, metadata, profile): |
| 934 item.parent.remove_widget(item) | |
| 935 log.info(f"item {item.data.get('path')} uploaded successfully") | |
| 936 | |
| 937 def _attachmentProgressEb(self, item, err_msg, profile): | |
| 938 item.parent.remove_widget(item) | |
| 939 path = item.data.get('path') | |
| 940 msg = _("item {path} could not be uploaded: {err_msg}").format( | |
| 941 path=path, err_msg=err_msg) | |
| 942 G.host.addNote(_("can't upload file"), msg, C.XMLUI_DATA_LVL_WARNING) | |
| 943 log.warning(msg) | |
| 944 | |
| 945 def _progressGetCb(self, item, metadata): | |
| 946 try: | |
| 947 position = int(metadata["position"]) | |
| 948 size = int(metadata["size"]) | |
| 949 except KeyError: | |
| 950 # we got empty metadata, the progression is either not yet started or | |
| 951 # finished | |
| 952 if item.progress: | |
| 953 # if progress is already started, receiving empty metadata means | |
| 954 # that progression is finished | |
| 955 item.progress = 100 | |
| 956 return | |
| 957 else: | |
| 958 item.progress = position/size*100 | |
| 959 | |
| 960 if item.parent is not None: | |
| 961 # the item is not yet fully received, we reschedule an update | |
| 962 Clock.schedule_once( | |
| 963 partial(self._attachmentProgressUpdate, item), | |
| 964 PROGRESS_UPDATE) | |
| 965 | |
| 966 def _attachmentProgressUpdate(self, item, __): | |
| 967 G.host.bridge.progressGet( | |
| 968 item.data["progress_id"], | |
| 969 self.profile, | |
| 970 callback=partial(self._progressGetCb, item), | |
| 971 errback=G.host.errback, | |
| 972 ) | |
| 973 | |
|
367
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
974 def addNick(self, nick): |
|
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
975 """Add a nickname to message_input if suitable""" |
|
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
976 if (self.type == C.CHAT_GROUP and not self.message_input.text.startswith(nick)): |
|
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
977 self.message_input.text = f'{nick}: {self.message_input.text}' |
|
abb57182ebfb
chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents:
357
diff
changeset
|
978 |
| 22 | 979 def onSend(self, input_widget): |
| 412 | 980 extra = {} |
| 981 for item in self.attachments_to_send.attachments.children: | |
| 982 if item.sending: | |
| 983 # the item is already being sent | |
| 984 continue | |
| 985 item.sending = True | |
| 986 progress_id = item.data["progress_id"] = str(uuid.uuid4()) | |
| 987 attachments = extra.setdefault(C.MESS_KEY_ATTACHMENTS, []) | |
| 988 attachment = { | |
| 989 "path": str(item.data["path"]), | |
| 990 "progress_id": progress_id, | |
| 991 } | |
|
448
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
992 if 'media_type' in item.data: |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
993 attachment[C.MESS_KEY_ATTACHMENTS_MEDIA_TYPE] = item.data['media_type'] |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
994 |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
995 if ((self.attachments_to_send.reduce_checkbox.active |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
996 and attachment.get('media_type', '').split('/')[0] == 'image')): |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
997 attachment[C.MESS_KEY_ATTACHMENTS_RESIZE] = True |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
998 |
| 412 | 999 attachments.append(attachment) |
| 1000 | |
| 1001 Clock.schedule_once( | |
| 1002 partial(self._attachmentProgressUpdate, item), | |
| 1003 PROGRESS_UPDATE) | |
| 1004 | |
| 1005 G.host.registerProgressCbs( | |
| 1006 progress_id, | |
| 1007 callback=partial(self._attachmentProgressCb, item), | |
| 1008 errback=partial(self._attachmentProgressEb, item) | |
| 1009 ) | |
| 1010 | |
| 1011 | |
| 22 | 1012 G.host.messageSend( |
| 1013 self.target, | |
| 412 | 1014 # TODO: handle language |
| 1015 {'': input_widget.text}, | |
| 1016 # TODO: put this in QuickChat | |
| 1017 mess_type= | |
| 1018 C.MESS_TYPE_GROUPCHAT if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT, | |
| 1019 extra=extra, | |
| 22 | 1020 profile_key=self.profile |
| 1021 ) | |
| 1022 input_widget.text = '' | |
| 1023 | |
|
448
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1024 def _imageCheckCb(self, report_raw): |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1025 report = data_format.deserialise(report_raw) |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1026 if report['too_large']: |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1027 self.attachments_to_send.show_resize=True |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1028 self.attachments_to_send.reduce_checkbox.active=True |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1029 |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1030 def addAttachment(self, file_path, media_type=None): |
| 412 | 1031 file_path = Path(file_path) |
|
448
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1032 if media_type is None: |
|
455
642cd2435e26
chat: fixed media_type guessing when Path is used for attachment
Goffi <goffi@goffi.org>
parents:
448
diff
changeset
|
1033 media_type = mimetypes.guess_type(str(file_path), strict=False)[0] |
|
448
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1034 if not self.attachments_to_send.show_resize and media_type is not None: |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1035 # we check if the attachment is an image and if it's too large. |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1036 # If too large, the reduce size check box will be displayed, and checked by |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1037 # default. |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1038 main_type = media_type.split('/')[0] |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1039 if main_type == "image": |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1040 G.host.bridge.imageCheck( |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1041 str(file_path), |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1042 callback=self._imageCheckCb, |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1043 errback=partial( |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1044 G.host.errback, |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1045 title=_("Can't check image size"), |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1046 message=_("Can't check image at {path}: {{msg}}").format( |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1047 path=file_path), |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1048 ) |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1049 ) |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1050 |
| 412 | 1051 data = { |
| 1052 "path": file_path, | |
| 1053 "name": file_path.name, | |
| 1054 } | |
|
448
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1055 |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1056 if media_type is not None: |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1057 data['media_type'] = media_type |
|
20a807443c3f
chat: resize attachments (images only for now):
Goffi <goffi@goffi.org>
parents:
446
diff
changeset
|
1058 |
| 412 | 1059 self.attachments_to_send.attachments.add_widget( |
| 1060 AttachmentToSendItem(data=data) | |
| 1061 ) | |
|
283
c73a7cd36b54
chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
1062 |
|
322
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
1063 def transferFile(self, file_path, transfer_type=C.TRANSFER_UPLOAD, cleaning_cb=None): |
| 412 | 1064 # FIXME: cleaning_cb is not managed |
|
322
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
1065 if transfer_type == C.TRANSFER_UPLOAD: |
| 412 | 1066 self.addAttachment(file_path) |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1067 elif transfer_type == C.TRANSFER_SEND: |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1068 if self.type == C.CHAT_GROUP: |
| 312 | 1069 log.warning("P2P transfer is not possible for group chat") |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1070 # TODO: show an error dialog to user, or better hide the send button for |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1071 # MUC |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1072 else: |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1073 jid_ = self.target |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1074 if not jid_.resource: |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1075 jid_ = G.host.contact_lists[self.profile].getFullJid(jid_) |
|
322
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
1076 G.host.bridge.fileSend(str(jid_), str(file_path), "", "", {}, |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1077 profile=self.profile) |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1078 # TODO: notification of sending/failing |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1079 else: |
| 312 | 1080 raise log.error("transfer of type {} are not handled".format(transfer_type)) |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
1081 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1082 def messageEncryptionStarted(self, plugin_data): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1083 quick_chat.QuickChat.messageEncryptionStarted(self, plugin_data) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1084 self.encryption_btn.symbol = SYMBOL_ENCRYPTED |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1085 self.encryption_btn.color = COLOR_ENCRYPTED |
| 312 | 1086 self.encryption_btn.selectAlgo(plugin_data['name']) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1087 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1088 def messageEncryptionStopped(self, plugin_data): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1089 quick_chat.QuickChat.messageEncryptionStopped(self, plugin_data) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1090 self.encryption_btn.symbol = SYMBOL_UNENCRYPTED |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1091 self.encryption_btn.color = COLOR_UNENCRYPTED |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
1092 self.encryption_btn.selectAlgo(None) |
| 78 | 1093 |
|
46
d6a63942d5ad
chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents:
45
diff
changeset
|
1094 def _mucJoinCb(self, joined_data): |
|
338
d4883f9576db
chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents:
334
diff
changeset
|
1095 joined, room_jid_s, occupants, user_nick, subject, statuses, profile = joined_data |
|
46
d6a63942d5ad
chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents:
45
diff
changeset
|
1096 self.host.mucRoomJoinedHandler(*joined_data[1:]) |
|
d6a63942d5ad
chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents:
45
diff
changeset
|
1097 jid_ = jid.JID(room_jid_s) |
|
42
286865bc013a
chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
1098 self.changeWidget(jid_) |
|
286865bc013a
chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
1099 |
|
286865bc013a
chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
1100 def _mucJoinEb(self, failure): |
| 312 | 1101 log.warning("Can't join room: {}".format(failure)) |
|
42
286865bc013a
chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
1102 |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1103 def onOTRState(self, state, dest_jid, profile): |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1104 assert profile in self.profiles |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1105 if state in OTR_STATE_ENCRYPTION: |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1106 self.otr_state_encryption = state |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1107 elif state in OTR_STATE_TRUST: |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1108 self.otr_state_trust = state |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1109 else: |
| 312 | 1110 log.error(_("Unknown OTR state received: {}".format(state))) |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1111 return |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
1112 self.encryption_btn.symbol = self.encryption_btn.getSymbol() |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
1113 self.encryption_btn.color = self.encryption_btn.getColor() |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
1114 |
|
265
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
1115 def onVisible(self): |
|
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
1116 if not self.sync: |
|
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
1117 self.resync() |
|
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
1118 |
|
396
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
1119 def onSelected(self): |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
1120 G.host.clearNotifs(self.target, profile=self.profile) |
|
ae6f7fd1cb0e
chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents:
395
diff
changeset
|
1121 |
|
356
307c2501d8b2
chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents:
354
diff
changeset
|
1122 def onDelete(self, **kwargs): |
|
393
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1123 if kwargs.get('explicit_close', False): |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1124 wrapper = self.whwrapper |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1125 if wrapper is not None: |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1126 if len(wrapper.carousel.slides) == 1: |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1127 # if we delete the last opened chat, we need to show the selector |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1128 screen_manager = self.screen_manager |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1129 screen_manager.transition.direction = 'down' |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1130 screen_manager.current = 'chat_selector' |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1131 wrapper.carousel.remove_widget(self) |
|
e2f806779b53
chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents:
387
diff
changeset
|
1132 return True |
|
261
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
1133 # we always keep one widget, so it's available when swiping |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
1134 # TODO: delete all widgets when chat is closed |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
1135 nb_instances = sum(1 for _ in self.host.widgets.getWidgetInstances(self)) |
|
356
307c2501d8b2
chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents:
354
diff
changeset
|
1136 # we want to keep at least one instance of Chat by WHWrapper |
|
307c2501d8b2
chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents:
354
diff
changeset
|
1137 nb_to_keep = len(G.host.widgets_handler.children) |
|
307c2501d8b2
chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents:
354
diff
changeset
|
1138 if nb_instances <= nb_to_keep: |
|
261
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
1139 return False |
| 22 | 1140 |
| 326 | 1141 def _history_unlock(self, __): |
| 1142 self._history_prepend_lock = False | |
| 1143 log.debug("history prepend unlocked") | |
| 1144 # we call manually onScroll, to check if we are still in the scrolling zone | |
| 1145 self.onScroll(self.history_scroll, self.history_scroll.scroll_y) | |
| 1146 | |
| 1147 def _history_scroll_adjust(self, __, scroll_start_height): | |
| 1148 # history scroll position must correspond to where it was before new messages | |
| 1149 # have been appended | |
| 1150 self.history_scroll.scroll_y = ( | |
| 1151 scroll_start_height / self.messages_widget.height | |
| 1152 ) | |
| 1153 | |
| 1154 # we want a small delay before unlocking, to avoid re-fetching history | |
| 1155 # again | |
| 1156 Clock.schedule_once(self._history_unlock, 1.5) | |
| 1157 | |
| 1158 def _backHistoryGetCb_post(self, __, history, scroll_start_height): | |
| 1159 if len(history) == 0: | |
| 1160 # we don't unlock self._history_prepend_lock if there is no history, as there | |
| 1161 # is no sense to try to retrieve more in this case. | |
| 1162 log.debug(f"we've reached top of history for {self.target.bare} chat") | |
| 1163 else: | |
| 1164 # we have to schedule again for _history_scroll_adjust, else messages_widget | |
| 1165 # is not resized (self.messages_widget.height is not yet updated) | |
| 1166 # as a result, the scroll_to can't work correctly | |
| 1167 Clock.schedule_once(partial( | |
| 1168 self._history_scroll_adjust, | |
| 1169 scroll_start_height=scroll_start_height)) | |
| 1170 log.debug( | |
| 1171 f"{len(history)} messages prepended to history (last: {history[0][0]})") | |
| 1172 | |
| 1173 def _backHistoryGetCb(self, history): | |
| 1174 # TODO: factorise with QuickChat._historyGetCb | |
| 1175 scroll_start_height = self.messages_widget.height * self.history_scroll.scroll_y | |
| 1176 for data in reversed(history): | |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
1177 uid, timestamp, from_jid, to_jid, message, subject, type_, extra_s = data |
| 326 | 1178 from_jid = jid.JID(from_jid) |
| 1179 to_jid = jid.JID(to_jid) | |
|
409
2caea63ae2ab
chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents:
406
diff
changeset
|
1180 extra = data_format.deserialise(extra_s) |
| 326 | 1181 extra["history"] = True |
| 1182 self.messages[uid] = message = quick_chat.Message( | |
| 1183 self, | |
| 1184 uid, | |
| 1185 timestamp, | |
| 1186 from_jid, | |
| 1187 to_jid, | |
| 1188 message, | |
| 1189 subject, | |
| 1190 type_, | |
| 1191 extra, | |
| 1192 self.profile, | |
| 1193 ) | |
| 1194 self.messages.move_to_end(uid, last=False) | |
| 1195 self.prependMessage(message) | |
| 1196 Clock.schedule_once(partial( | |
| 1197 self._backHistoryGetCb_post, | |
| 1198 history=history, | |
| 1199 scroll_start_height=scroll_start_height)) | |
| 1200 | |
| 1201 def _backHistoryGetEb(self, failure_): | |
| 1202 G.host.addNote( | |
| 1203 _("Problem while getting back history"), | |
| 1204 _("Can't back history for {target}: {problem}").format( | |
| 1205 target=self.target, problem=failure_), | |
| 1206 C.XMLUI_DATA_LVL_ERROR) | |
| 1207 # we don't unlock self._history_prepend_lock on purpose, no need | |
| 1208 # to try to get more history if something is wrong | |
| 1209 | |
| 1210 def onScroll(self, scroll_view, scroll_y): | |
| 1211 if self._history_prepend_lock: | |
| 1212 return | |
| 1213 if (1-scroll_y) * self.messages_widget.height < INFINITE_SCROLL_LIMIT: | |
| 1214 self._history_prepend_lock = True | |
| 1215 log.debug(f"Retrieving back history for {self} [{self.history_count}]") | |
| 1216 self.history_count += 1 | |
| 1217 first_uid = next(iter(self.messages.keys())) | |
| 1218 filters = self.history_filters.copy() | |
| 1219 filters['before_uid'] = first_uid | |
| 1220 self.host.bridge.historyGet( | |
| 1221 str(self.host.profiles[self.profile].whoami.bare), | |
| 1222 str(self.target), | |
| 1223 30, | |
| 1224 True, | |
| 1225 {k: str(v) for k,v in filters.items()}, | |
| 1226 self.profile, | |
| 1227 callback=self._backHistoryGetCb, | |
| 1228 errback=self._backHistoryGetEb, | |
| 1229 ) | |
| 1230 | |
| 22 | 1231 |
|
395
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1232 class ChatSelector(cagou_widget.CagouWidget, FilterBehavior): |
|
394
d15828ca9d86
chat: use the new "implicit_update" and "to_show" properties for ChatSelector.jid_selector:
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
1233 jid_selector = properties.ObjectProperty() |
| 354 | 1234 profile = properties.StringProperty() |
| 1235 plugin_info_class = Chat | |
|
395
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1236 use_header_input = True |
| 354 | 1237 |
| 1238 def on_select(self, contact_button): | |
| 1239 contact_jid = jid.JID(contact_button.jid) | |
| 1240 plugin_info = G.host.getPluginInfo(main=Chat) | |
| 1241 factory = plugin_info['factory'] | |
| 1242 self.screen_manager.transition.direction = 'up' | |
| 1243 carousel = self.whwrapper.carousel | |
| 1244 current_slides = {w.target: w for w in carousel.slides} | |
| 1245 if contact_jid in current_slides: | |
| 1246 slide = current_slides[contact_jid] | |
| 1247 idx = carousel.slides.index(slide) | |
| 1248 carousel.index = idx | |
| 1249 self.screen_manager.current = '' | |
| 1250 else: | |
| 1251 G.host.switchWidget( | |
| 1252 self, factory(plugin_info, contact_jid, profiles=[self.profile])) | |
| 1253 | |
| 1254 | |
|
395
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1255 def onHeaderInput(self): |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1256 text = self.header_input.text.strip() |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1257 try: |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1258 if text.count('@') != 1 or text.count(' '): |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1259 raise ValueError |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1260 jid_ = jid.JID(text) |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1261 except ValueError: |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1262 log.info("entered text is not a jid") |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1263 return |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1264 G.host.doAction("chat", jid_, [self.profile]) |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1265 |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1266 def onHeaderInputComplete(self, wid, text, **kwargs): |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1267 """we filter items when text is entered in input box""" |
|
404
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1268 for layout in self.jid_selector.items_layouts: |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1269 self.do_filter( |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1270 layout, |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1271 text, |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1272 # we append nick to jid to filter on both |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1273 lambda c: c.jid + c.data.get('nick', ''), |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1274 width_cb=lambda c: c.base_width, |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1275 height_cb=lambda c: c.minimum_height, |
|
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
396
diff
changeset
|
1276 continue_tests=[lambda c: not isinstance(c, ContactButton)]) |
|
395
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1277 |
|
c04c3b167cb0
chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents:
394
diff
changeset
|
1278 |
| 22 | 1279 PLUGIN_INFO["factory"] = Chat.factory |
| 1280 quick_widgets.register(quick_chat.QuickChat, Chat) |