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