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