Mercurial > libervia-desktop-kivy
annotate cagou/plugins/plugin_wid_chat.py @ 329:51520ce98154
common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
DelayedBoxLayout has a new `dont_delay_next_layouts` property to skip delaying for the
next X sizing. This is used in chat widget to avoid unpleasant flickering when a new
message is sent or received.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Fri, 20 Dec 2019 12:29:37 +0100 |
| parents | d9d2b56f46db |
| children | 13bc00b9743a |
| rev | line source |
|---|---|
| 22 | 1 #!/usr/bin/python |
| 2 | |
| 3 # Cagou: desktop/mobile frontend for Salut à Toi XMPP client | |
| 282 | 4 # Copyright (C) 2016-2019 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 |
| 21 import mimetypes | |
| 22 import sys | |
| 78 | 23 from kivy.uix.boxlayout import BoxLayout |
| 22 | 24 from kivy.uix.textinput import TextInput |
|
185
ab3f5173ef5c
chat, simple XHTML: font size adjustement
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
25 from kivy.metrics import sp, dp |
| 276 | 26 from kivy.clock import Clock |
| 22 | 27 from kivy import properties |
| 325 | 28 from kivy.uix.dropdown import DropDown |
| 29 from kivy.core.window import Window | |
| 30 from sat.core import log as logging | |
| 31 from sat.core.i18n import _ | |
| 32 from sat.core import exceptions | |
| 22 | 33 from sat_frontends.quick_frontend import quick_widgets |
| 34 from sat_frontends.quick_frontend import quick_chat | |
|
106
9909ed7a7a20
moved SimpleXHTMLWidget to a dedicated module
Goffi <goffi@goffi.org>
parents:
105
diff
changeset
|
35 from sat_frontends.tools import jid |
| 325 | 36 from cagou import G |
| 37 from cagou.core.constants import Const as C | |
| 22 | 38 from cagou.core import cagou_widget |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
39 from cagou.core import xmlui |
|
106
9909ed7a7a20
moved SimpleXHTMLWidget to a dedicated module
Goffi <goffi@goffi.org>
parents:
105
diff
changeset
|
40 from cagou.core.image import Image |
|
193
284cb5c467b0
core (common): split JidItem in 3 classes:
Goffi <goffi@goffi.org>
parents:
186
diff
changeset
|
41 from cagou.core.common import SymbolButton, JidButton |
|
278
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
42 from cagou.core import menu |
| 22 | 43 |
| 276 | 44 log = logging.getLogger(__name__) |
| 22 | 45 |
| 46 PLUGIN_INFO = { | |
| 312 | 47 "name": _("chat"), |
| 22 | 48 "main": "Chat", |
| 312 | 49 "description": _("instant messaging with one person or a group"), |
| 50 "icon_symbol": "chat", | |
| 22 | 51 } |
| 52 | |
|
244
5bd94bc08f5c
plugin chat: fixed OTR State filtering + removed some legacy code
Goffi <goffi@goffi.org>
parents:
242
diff
changeset
|
53 # 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
|
54 # 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
|
55 OTR_STATE_UNTRUSTED = 'untrusted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
56 OTR_STATE_TRUSTED = 'trusted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
57 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
|
58 OTR_STATE_UNENCRYPTED = 'unencrypted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
59 OTR_STATE_ENCRYPTED = 'encrypted' |
|
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
60 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
|
61 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
62 SYMBOL_UNENCRYPTED = 'lock-open' |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
63 SYMBOL_ENCRYPTED = 'lock' |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
64 SYMBOL_ENCRYPTED_TRUSTED = 'lock-filled' |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
65 COLOR_UNENCRYPTED = (0.4, 0.4, 0.4, 1) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
66 COLOR_ENCRYPTED = (0.4, 0.4, 0.4, 1) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
67 COLOR_ENCRYPTED_TRUSTED = (0.29,0.87,0.0,1) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
68 |
| 326 | 69 # below this limit, new messages will be prepended |
| 70 INFINITE_SCROLL_LIMIT = dp(600) | |
| 71 | |
| 22 | 72 |
|
44
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
73 class MessAvatar(Image): |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
74 pass |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
75 |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
76 |
| 325 | 77 class MessageWidget(quick_chat.MessageWidget, BoxLayout): |
| 22 | 78 mess_data = properties.ObjectProperty() |
| 57 | 79 mess_xhtml = properties.ObjectProperty() |
| 45 | 80 mess_padding = (dp(5), dp(5)) |
|
47
abb81efef3bb
chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents:
46
diff
changeset
|
81 avatar = properties.ObjectProperty() |
|
103
c601e3d40342
chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents:
102
diff
changeset
|
82 delivery = properties.ObjectProperty() |
|
185
ab3f5173ef5c
chat, simple XHTML: font size adjustement
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
83 font_size = properties.NumericProperty(sp(12)) |
| 325 | 84 right_part = properties.ObjectProperty() |
| 85 header_box = properties.ObjectProperty() | |
|
47
abb81efef3bb
chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents:
46
diff
changeset
|
86 |
| 325 | 87 def on_mess_data(self, wid, mess_data): |
| 88 mess_data.widgets.add(self) | |
|
44
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
89 |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
90 @property |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
91 def chat(self): |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
92 """return parent Chat instance""" |
|
7819e9efa250
chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents:
42
diff
changeset
|
93 return self.mess_data.parent |
| 22 | 94 |
| 325 | 95 def _get_from_mess_data(self, name, default): |
| 96 if self.mess_data is None: | |
| 97 return default | |
| 98 return getattr(self.mess_data, name) | |
| 99 | |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
100 def _get_message(self): |
| 22 | 101 """Return currently displayed message""" |
| 325 | 102 if self.mess_data is None: |
| 103 return "" | |
| 22 | 104 return self.mess_data.main_message |
| 105 | |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
106 def _set_message(self, message): |
| 325 | 107 if self.mess_data is None: |
| 108 return False | |
| 312 | 109 if message == self.mess_data.message.get(""): |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
110 return False |
| 312 | 111 self.mess_data.message = {"": message} |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
112 return True |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
113 |
| 325 | 114 message = properties.AliasProperty( |
| 115 partial(_get_from_mess_data, name="main_message", default=""), | |
| 116 _set_message, | |
| 117 bind=['mess_data'], | |
| 118 ) | |
| 119 message_xhtml = properties.AliasProperty( | |
| 120 partial(_get_from_mess_data, name="main_message_xhtml", default=""), | |
| 121 bind=['mess_data']) | |
| 122 mess_type = properties.AliasProperty( | |
| 123 partial(_get_from_mess_data, name="type", default=""), bind=['mess_data']) | |
| 124 own_mess = properties.AliasProperty( | |
| 125 partial(_get_from_mess_data, name="own_mess", default=False), bind=['mess_data']) | |
| 126 nick = properties.AliasProperty( | |
| 127 partial(_get_from_mess_data, name="nick", default=""), bind=['mess_data']) | |
| 128 time_text = properties.AliasProperty( | |
| 129 partial(_get_from_mess_data, name="time_text", default=""), bind=['mess_data']) | |
| 57 | 130 |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
131 @property |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
132 def info_type(self): |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
133 return self.mess_data.info_type |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
134 |
|
54
514c187afebc
chat: changed udpate to use dict instead of single key/value
Goffi <goffi@goffi.org>
parents:
47
diff
changeset
|
135 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
|
136 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
|
137 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
|
138 if 'status' in update_dict: |
|
c601e3d40342
chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents:
102
diff
changeset
|
139 status = update_dict['status'] |
| 312 | 140 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
|
141 |
| 22 | 142 |
| 276 | 143 class SendButton(SymbolButton): |
| 144 message_input_box = properties.ObjectProperty() | |
| 145 | |
| 146 | |
| 78 | 147 class MessageInputBox(BoxLayout): |
| 276 | 148 message_input = properties.ObjectProperty() |
| 149 | |
| 150 def __init__(self, *args, **kwargs): | |
| 151 super(MessageInputBox, self).__init__(*args, **kwargs) | |
| 152 Clock.schedule_once(self.post_init, 0) | |
| 153 | |
| 154 def post_init(self, *args): | |
| 155 if sys.platform == 'android': | |
| 156 self.add_widget(SendButton(message_input_box=self), 0) | |
| 157 | |
| 158 def send_text(self): | |
| 159 self.message_input.send_text() | |
| 78 | 160 |
| 161 | |
| 22 | 162 class MessageInputWidget(TextInput): |
| 163 | |
| 276 | 164 def keyboard_on_key_down(self, window, keycode, text, modifiers): |
| 165 # We don't send text when shift is pressed to be able to add line feeds | |
| 166 # (i.e. multi-lines messages). We don't send on Android either as the | |
| 167 # send button appears on this platform. | |
| 168 if (keycode[-1] == "enter" | |
| 169 and "shift" not in modifiers | |
| 170 and sys.platform != 'android'): | |
| 171 self.send_text() | |
| 22 | 172 else: |
| 276 | 173 return super(MessageInputWidget, self).keyboard_on_key_down( |
| 174 window, keycode, text, modifiers) | |
| 175 | |
| 176 def send_text(self): | |
| 177 self.dispatch('on_text_validate') | |
| 22 | 178 |
| 179 | |
|
278
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
180 class TransferButton(SymbolButton): |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
181 chat = properties.ObjectProperty() |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
182 |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
183 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
|
184 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
|
185 |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
186 |
|
287
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
187 class ExtraMenu(DropDown): |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
188 chat = properties.ObjectProperty() |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
189 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
190 def on_select(self, menu): |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
191 if menu == 'bookmark': |
| 312 | 192 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
|
193 {}, C.NO_SECURITY_LIMIT, self.chat.profile, |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
194 callback=partial( |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
195 G.host.actionManager, profile=self.chat.profile), |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
196 errback=G.host.errback) |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
197 else: |
| 312 | 198 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
|
199 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
200 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
201 class ExtraButton(SymbolButton): |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
202 chat = properties.ObjectProperty() |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
203 |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
204 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
205 class EncryptionMainButton(SymbolButton): |
| 117 | 206 |
| 207 def __init__(self, chat, **kwargs): | |
| 208 """ | |
| 209 @param chat(Chat): Chat instance | |
| 210 """ | |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
211 self.chat = chat |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
212 self.encryption_menu = EncryptionMenu(chat) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
213 super(EncryptionMainButton, self).__init__(**kwargs) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
214 self.bind(on_release=self.encryption_menu.open) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
215 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
216 def selectAlgo(self, name): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
217 """Mark an encryption algorithm as selected. |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
218 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
219 This will also deselect all other button |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
220 @param name(unicode, None): encryption plugin name |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
221 None for plain text |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
222 """ |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
223 buttons = self.encryption_menu.container.children |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
224 buttons[-1].selected = name is None |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
225 for button in buttons[:-1]: |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
226 button.selected = button.text == name |
| 117 | 227 |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
228 def getColor(self): |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
229 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
|
230 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
|
231 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
|
232 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
|
233 else: |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
234 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
|
235 |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
236 def getSymbol(self): |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
237 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
|
238 return 'lock-open' |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
239 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
|
240 return 'lock-filled' |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
241 else: |
|
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
242 return 'lock' |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
243 |
| 117 | 244 |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
245 class TrustManagementButton(SymbolButton): |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
246 pass |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
247 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
248 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
249 class EncryptionButton(BoxLayout): |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
250 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
|
251 text = properties.StringProperty() |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
252 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
|
253 best_width = properties.NumericProperty(0) |
| 312 | 254 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
|
255 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
256 def __init__(self, **kwargs): |
| 312 | 257 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
|
258 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
|
259 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
|
260 if self.trust_button: |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
261 self.add_widget(TrustManagementButton()) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
262 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
263 def on_release(self): |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
264 pass |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
265 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
266 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
|
267 pass |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
268 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
269 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
270 class EncryptionMenu(DropDown): |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
271 # 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
|
272 best_width = properties.NumericProperty(0) |
| 117 | 273 |
| 274 def __init__(self, chat, **kwargs): | |
| 275 """ | |
| 276 @param chat(Chat): Chat instance | |
| 277 """ | |
| 278 self.chat = chat | |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
279 super(EncryptionMenu, self).__init__(**kwargs) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
280 btn = EncryptionButton( |
| 312 | 281 text=_("unencrypted (plain text)"), |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
282 on_release=self.unencrypted, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
283 selected=True, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
284 bold=False, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
285 ) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
286 self.add_widget(btn) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
287 for plugin in G.host.encryption_plugins: |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
288 btn = EncryptionButton( |
| 312 | 289 text=plugin['name'], |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
290 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
|
291 on_trust_release=partial(self.getTrustUI, plugin=plugin), |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
292 trust_button=True, |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
293 ) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
294 self.add_widget(btn) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
295 log.info("added encryption: {}".format(plugin['name'])) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
296 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
297 def messageEncryptionStopCb(self): |
| 312 | 298 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
|
299 destinee = self.chat.target)) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
300 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
301 def messageEncryptionStopEb(self, failure_): |
| 312 | 302 msg = _("Error while stopping encryption with {destinee}: {reason}").format( |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
303 destinee = self.chat.target, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
304 reason = failure_) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
305 log.warning(msg) |
| 312 | 306 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
|
307 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
308 def unencrypted(self, button): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
309 self.dismiss() |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
310 G.host.bridge.messageEncryptionStop( |
| 312 | 311 str(self.chat.target), |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
312 self.chat.profile, |
|
242
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
313 callback=self.messageEncryptionStopCb, |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
314 errback=self.messageEncryptionStopEb) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
315 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
316 def messageEncryptionStartCb(self, plugin): |
| 312 | 317 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
|
318 destinee = self.chat.target, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
319 encr_name = plugin['name'])) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
320 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
321 def messageEncryptionStartEb(self, failure_): |
| 312 | 322 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
|
323 destinee = self.chat.target, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
324 reason = failure_) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
325 log.warning(msg) |
| 312 | 326 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
|
327 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
328 def startEncryption(self, button, plugin): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
329 """Request encryption with given plugin for this session |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
330 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
331 @param button(EncryptionButton): button which has been pressed |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
332 @param plugin(dict): plugin data |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
333 """ |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
334 self.dismiss() |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
335 G.host.bridge.messageEncryptionStart( |
| 312 | 336 str(self.chat.target), |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
337 plugin['namespace'], |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
338 True, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
339 self.chat.profile, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
340 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
|
341 errback=self.messageEncryptionStartEb) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
342 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
343 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
|
344 xml_ui = xmlui.create( |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
345 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
|
346 xml_ui.show() |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
347 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
348 def encryptionTrustUIGetEb(self, failure_): |
| 312 | 349 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
|
350 reason = failure_) |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
351 log.warning(msg) |
| 312 | 352 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
|
353 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
|
354 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
355 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
|
356 """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
|
357 |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
358 @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
|
359 @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
|
360 """ |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
361 self.dismiss() |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
362 G.host.bridge.encryptionTrustUIGet( |
| 312 | 363 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
|
364 plugin['namespace'], |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
365 self.chat.profile, |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
366 callback=self.encryptionTrustUIGetCb, |
|
c2503168fab7
plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents:
233
diff
changeset
|
367 errback=self.encryptionTrustUIGetEb) |
| 117 | 368 |
| 369 def otr_start(self): | |
| 370 self.dismiss() | |
| 371 G.host.launchMenu( | |
| 372 C.MENU_SINGLE, | |
| 312 | 373 ("otr", "start/refresh"), |
| 374 {'jid': str(self.chat.target)}, | |
| 117 | 375 None, |
| 376 C.NO_SECURITY_LIMIT, | |
| 377 self.chat.profile | |
| 378 ) | |
| 379 | |
| 380 def otr_end(self): | |
| 381 self.dismiss() | |
| 382 G.host.launchMenu( | |
| 383 C.MENU_SINGLE, | |
| 312 | 384 ("otr", "end session"), |
| 385 {'jid': str(self.chat.target)}, | |
| 117 | 386 None, |
| 387 C.NO_SECURITY_LIMIT, | |
| 388 self.chat.profile | |
| 389 ) | |
| 390 | |
| 391 def otr_authenticate(self): | |
| 392 self.dismiss() | |
| 393 G.host.launchMenu( | |
| 394 C.MENU_SINGLE, | |
| 312 | 395 ("otr", "authenticate"), |
| 396 {'jid': str(self.chat.target)}, | |
| 117 | 397 None, |
| 398 C.NO_SECURITY_LIMIT, | |
| 399 self.chat.profile | |
| 400 ) | |
| 401 | |
| 402 | |
| 22 | 403 class Chat(quick_chat.QuickChat, cagou_widget.CagouWidget): |
| 78 | 404 message_input = properties.ObjectProperty() |
| 86 | 405 messages_widget = properties.ObjectProperty() |
| 326 | 406 history_scroll = properties.ObjectProperty() |
| 22 | 407 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
408 def __init__(self, host, target, type_=C.CHAT_ONE2ONE, nick=None, occupants=None, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
409 subject=None, profiles=None): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
410 quick_chat.QuickChat.__init__( |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
411 self, host, target, type_, nick, occupants, subject, profiles=profiles) |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
412 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
|
413 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
|
414 # 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
|
415 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
|
416 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
|
417 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
|
418 self._hi_comp_allowed = True |
| 22 | 419 cagou_widget.CagouWidget.__init__(self) |
|
278
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
420 transfer_btn = TransferButton(chat=self) |
|
444ba439530f
chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents:
277
diff
changeset
|
421 self.headerInputAddExtra(transfer_btn) |
| 117 | 422 if type_ == C.CHAT_ONE2ONE: |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
423 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
|
424 self.headerInputAddExtra(self.encryption_btn) |
|
287
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
425 self.extra_menu = ExtraMenu(chat=self) |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
426 extra_btn = ExtraButton(chat=self) |
|
5d96bcd3bfec
chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents:
284
diff
changeset
|
427 self.headerInputAddExtra(extra_btn) |
| 325 | 428 self.header_input.hint_text = target |
| 326 | 429 self._history_prepend_lock = False |
| 325 | 430 Clock.schedule_once(lambda dt: self.postInit(), 0) |
| 326 | 431 self.history_count = 0 |
| 22 | 432 |
|
156
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
433 def __str__(self): |
| 312 | 434 return "Chat({})".format(self.target) |
|
156
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
435 |
|
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
436 def __repr__(self): |
|
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
437 return self.__str__() |
|
826e7b17a19b
chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents:
145
diff
changeset
|
438 |
| 22 | 439 @classmethod |
| 440 def factory(cls, plugin_info, target, profiles): | |
| 441 profiles = list(profiles) | |
| 442 if len(profiles) > 1: | |
| 312 | 443 raise NotImplementedError("Multi-profiles is not available yet for chat") |
| 22 | 444 if target is None: |
| 445 target = G.host.profiles[profiles[0]].whoami | |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
446 return G.host.widgets.getOrCreateWidget(cls, target, on_new_widget=None, |
|
260
145c29b5f2b5
core: improved getOrClone + use in chat and widgets_handler:
Goffi <goffi@goffi.org>
parents:
250
diff
changeset
|
447 on_existing_widget=G.host.getOrClone, |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
448 profiles=profiles) |
| 22 | 449 |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
450 @property |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
451 def message_widgets_rev(self): |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
452 return self.messages_widget.children |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
453 |
|
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
|
454 ## 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
|
455 |
|
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
|
456 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
|
457 """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
|
458 |
|
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
|
459 @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
|
460 """ |
|
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
|
461 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
|
462 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
|
463 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
|
464 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
|
465 |
|
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
|
466 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
|
467 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
|
468 try: |
| 312 | 469 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
|
470 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
|
471 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
|
472 except ValueError: |
| 312 | 473 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
|
474 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
|
475 |
|
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
|
476 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
|
477 # 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
|
478 if "conference" in [i[0] for i in disco[1]]: |
| 312 | 479 G.host.bridge.mucJoin(str(jid_), "", "", self.profile, |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
480 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
|
481 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
|
482 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
|
483 |
|
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
|
484 def discoEb(failure): |
| 312 | 485 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
|
486 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
487 G.host.bridge.discoInfos(jid_.domain, self.profile, callback=discoCb, |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
488 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
|
489 |
|
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
|
490 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
|
491 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
|
492 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
|
493 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
|
494 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
|
495 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
|
496 |
|
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
|
497 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
|
498 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
|
499 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
|
500 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
|
501 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
|
502 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
|
503 self._hi_comp_last = None |
| 144 | 504 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
|
505 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
|
506 |
|
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
|
507 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
|
508 |
|
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
|
509 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
|
510 # 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
|
511 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
|
512 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
|
513 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
|
514 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
|
515 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
|
516 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
|
517 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
|
518 |
|
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
|
519 # 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
|
520 # 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
|
521 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
|
522 |
|
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
|
523 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
|
524 # 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
|
525 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
|
526 |
|
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
|
527 for jid_, jid_data in comp_data: |
| 312 | 528 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
|
529 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
|
530 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
|
531 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
|
532 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
|
533 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
|
534 nick = nick, |
| 284 | 535 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
|
536 ) |
|
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
|
537 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
|
538 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
|
539 # 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
|
540 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
|
541 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
|
542 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
|
543 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
|
544 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
|
545 dropdown.remove_widget(c) |
| 144 | 546 if dropdown.attach_to is None: |
| 547 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
|
548 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
|
549 |
| 22 | 550 def messageDataConverter(self, idx, mess_id): |
| 551 return {"mess_data": self.messages[mess_id]} | |
| 552 | |
| 553 def _onHistoryPrinted(self): | |
| 554 """Refresh or scroll down the focus after the history is printed""" | |
| 555 # self.adapter.data = self.messages | |
| 312 | 556 for mess_data in self.messages.values(): |
| 22 | 557 self.appendMessage(mess_data) |
| 558 super(Chat, self)._onHistoryPrinted() | |
| 559 | |
| 560 def createMessage(self, message): | |
| 561 self.appendMessage(message) | |
|
329
51520ce98154
common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
Goffi <goffi@goffi.org>
parents:
326
diff
changeset
|
562 # 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
|
563 # 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
|
564 self.messages_widget.dont_delay_next_layouts = 2 |
| 22 | 565 |
| 566 def appendMessage(self, mess_data): | |
|
289
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
567 """Append a message Widget to the history |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
568 |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
569 @param mess_data(quick_chat.Message): message data |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
570 """ |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
571 if self.handleUserMoved(mess_data): |
|
717c6c368f70
chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents:
287
diff
changeset
|
572 return |
| 22 | 573 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
|
574 self.notify(mess_data) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
575 |
| 326 | 576 def prependMessage(self, mess_data): |
| 577 """Prepend a message Widget to the history | |
| 578 | |
| 579 @param mess_data(quick_chat.Message): message data | |
| 580 """ | |
| 581 mess_wid = self.messages_widget | |
| 582 last_idx = len(mess_wid.children) | |
| 583 mess_wid.add_widget(MessageWidget(mess_data=mess_data), index=last_idx) | |
| 584 | |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
585 def _get_notif_msg(self, mess_data): |
| 312 | 586 return _("{nick}: {message}").format( |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
587 nick=mess_data.nick, |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
588 message=mess_data.main_message) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
589 |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
590 def notify(self, mess_data): |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
591 """Notify user when suitable |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
592 |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
593 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
|
594 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
|
595 is not visible. |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
596 For group chat, note will be added on mention, with a desktop notification if |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
597 window has not focus. |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
598 """ |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
599 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
|
600 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
|
601 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
|
602 # 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
|
603 # 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
|
604 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
|
605 is_visible = bool(visible_clones) |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
606 if self.type == C.CHAT_ONE2ONE: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
607 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
|
608 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
|
609 G.host.desktop_notif( |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
610 notif_msg, |
| 312 | 611 title=_("private message")) |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
612 if not is_visible: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
613 G.host.addNote( |
| 312 | 614 _("private message"), |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
615 notif_msg, |
| 312 | 616 symbol = "chat", |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
617 action = { |
| 312 | 618 "action": 'chat', |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
619 "target": self.target, |
|
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
620 "profiles": self.profiles} |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
621 ) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
622 else: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
623 if mess_data.mention and not mess_data.history: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
624 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
|
625 G.host.addNote( |
| 312 | 626 _("mention"), |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
627 notif_msg, |
| 312 | 628 symbol = "chat", |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
629 action = { |
| 312 | 630 "action": 'chat', |
|
250
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
631 "target": self.target, |
|
ff1efdeff53f
core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents:
244
diff
changeset
|
632 "profiles": self.profiles} |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
633 ) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
634 if not Window.focus: |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
635 G.host.desktop_notif( |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
636 notif_msg, |
| 312 | 637 title=_("mention ({room_jid})").format( |
|
184
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
638 room_jid=self.target) |
|
c63922860f80
chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents:
180
diff
changeset
|
639 ) |
| 22 | 640 |
| 641 def onSend(self, input_widget): | |
| 642 G.host.messageSend( | |
| 643 self.target, | |
| 644 {'': input_widget.text}, # TODO: handle language | |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
645 mess_type = (C.MESS_TYPE_GROUPCHAT |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
646 if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT), # TODO: put this in QuickChat |
| 22 | 647 profile_key=self.profile |
| 648 ) | |
| 649 input_widget.text = '' | |
| 650 | |
|
277
f5302d57fb09
chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents:
276
diff
changeset
|
651 def fileTransferEb(self, err_msg, cleaning_cb, profile): |
|
88
3dc526bb4a5a
upload: plugin android gallery, first draft:
Goffi <goffi@goffi.org>
parents:
86
diff
changeset
|
652 if cleaning_cb is not None: |
|
3dc526bb4a5a
upload: plugin android gallery, first draft:
Goffi <goffi@goffi.org>
parents:
86
diff
changeset
|
653 cleaning_cb() |
| 312 | 654 msg = _("can't transfer file: {reason}").format(reason=err_msg) |
|
283
c73a7cd36b54
chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
655 log.warning(msg) |
| 312 | 656 G.host.addNote(_("File transfer error"), |
| 295 | 657 msg, |
| 658 level=C.XMLUI_DATA_LVL_WARNING) | |
| 78 | 659 |
|
277
f5302d57fb09
chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents:
276
diff
changeset
|
660 def fileTransferCb(self, metadata, cleaning_cb, profile): |
|
97
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
90
diff
changeset
|
661 log.debug("file transfered: {}".format(metadata)) |
|
111
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
662 extra = {} |
|
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
663 |
|
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
664 # FIXME: Q&D way of getting file type, upload plugins shouls give it |
|
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
665 mime_type = mimetypes.guess_type(metadata['url'])[0] |
|
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
666 if mime_type is not None: |
| 312 | 667 if mime_type.split('/')[0] == 'image': |
|
111
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
668 # we generate url ourselves, so this formatting is safe |
| 312 | 669 extra['xhtml'] = "<img src='{url}' />".format(**metadata) |
|
111
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
670 |
| 78 | 671 G.host.messageSend( |
| 672 self.target, | |
| 673 {'': metadata['url']}, | |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
674 mess_type = (C.MESS_TYPE_GROUPCHAT |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
675 if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT), |
|
111
c3952922ca56
chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents:
109
diff
changeset
|
676 extra = extra, |
| 78 | 677 profile_key=profile |
| 678 ) | |
| 679 | |
|
322
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
680 if cleaning_cb is not None: |
|
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
681 cleaning_cb() |
|
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
682 |
|
283
c73a7cd36b54
chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
683 |
|
322
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
684 def transferFile(self, file_path, transfer_type=C.TRANSFER_UPLOAD, cleaning_cb=None): |
|
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
685 if transfer_type == C.TRANSFER_UPLOAD: |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
686 G.host.bridge.fileUpload( |
|
322
e2b51663d8b8
core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents:
312
diff
changeset
|
687 str(file_path), |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
688 "", |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
689 "", |
|
281
ef77423ce500
core: store tls_validation flag in host and use if for file upload.
Goffi <goffi@goffi.org>
parents:
278
diff
changeset
|
690 {"ignore_tls_errors": C.boolConst(not G.host.tls_validation)}, |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
691 self.profile, |
|
277
f5302d57fb09
chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents:
276
diff
changeset
|
692 callback = partial( |
|
f5302d57fb09
chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents:
276
diff
changeset
|
693 G.host.actionManager, |
|
f5302d57fb09
chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents:
276
diff
changeset
|
694 progress_cb = partial(self.fileTransferCb, cleaning_cb=cleaning_cb), |
|
281
ef77423ce500
core: store tls_validation flag in host and use if for file upload.
Goffi <goffi@goffi.org>
parents:
278
diff
changeset
|
695 progress_eb = partial(self.fileTransferEb, cleaning_cb=cleaning_cb), |
|
283
c73a7cd36b54
chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
696 profile = self.profile, |
|
c73a7cd36b54
chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
697 ), |
|
c73a7cd36b54
chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
698 errback = partial(G.host.errback, |
| 312 | 699 message=_("can't upload file: {msg}")) |
|
277
f5302d57fb09
chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents:
276
diff
changeset
|
700 ) |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
701 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
|
702 if self.type == C.CHAT_GROUP: |
| 312 | 703 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
|
704 # 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
|
705 # MUC |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
706 else: |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
707 jid_ = self.target |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
708 if not jid_.resource: |
|
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
709 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
|
710 G.host.bridge.fileSend(str(jid_), str(file_path), "", "", {}, |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
711 profile=self.profile) |
|
98
4d8c122b86a6
menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents:
97
diff
changeset
|
712 # 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
|
713 else: |
| 312 | 714 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
|
715 |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
716 def messageEncryptionStarted(self, plugin_data): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
717 quick_chat.QuickChat.messageEncryptionStarted(self, plugin_data) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
718 self.encryption_btn.symbol = SYMBOL_ENCRYPTED |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
719 self.encryption_btn.color = COLOR_ENCRYPTED |
| 312 | 720 self.encryption_btn.selectAlgo(plugin_data['name']) |
|
233
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
721 |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
722 def messageEncryptionStopped(self, plugin_data): |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
723 quick_chat.QuickChat.messageEncryptionStopped(self, plugin_data) |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
724 self.encryption_btn.symbol = SYMBOL_UNENCRYPTED |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
725 self.encryption_btn.color = COLOR_UNENCRYPTED |
|
ba8f3a4a5ac7
plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents:
225
diff
changeset
|
726 self.encryption_btn.selectAlgo(None) |
| 78 | 727 |
|
46
d6a63942d5ad
chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents:
45
diff
changeset
|
728 def _mucJoinCb(self, joined_data): |
|
d6a63942d5ad
chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents:
45
diff
changeset
|
729 joined, room_jid_s, occupants, user_nick, subject, profile = joined_data |
|
d6a63942d5ad
chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents:
45
diff
changeset
|
730 self.host.mucRoomJoinedHandler(*joined_data[1:]) |
|
d6a63942d5ad
chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents:
45
diff
changeset
|
731 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
|
732 self.changeWidget(jid_) |
|
286865bc013a
chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
733 |
|
286865bc013a
chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
734 def _mucJoinEb(self, failure): |
| 312 | 735 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
|
736 |
|
122
dcd6fbb3f010
chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents:
121
diff
changeset
|
737 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
|
738 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
|
739 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
|
740 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
|
741 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
|
742 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
|
743 else: |
| 312 | 744 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
|
745 return |
|
135
091e288838e1
plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
746 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
|
747 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
|
748 |
|
265
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
749 def onVisible(self): |
|
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
750 if not self.sync: |
|
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
751 self.resync() |
|
805c4103dac5
core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents:
261
diff
changeset
|
752 |
|
261
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
753 def onDelete(self): |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
754 # 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
|
755 # TODO: delete all widgets when chat is closed |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
756 nb_instances = sum(1 for _ in self.host.widgets.getWidgetInstances(self)) |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
757 if nb_instances > 1: |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
758 return super(Chat, self).onDelete() |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
759 else: |
|
a579eda31f4f
chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents:
260
diff
changeset
|
760 return False |
| 22 | 761 |
| 326 | 762 def _history_unlock(self, __): |
| 763 self._history_prepend_lock = False | |
| 764 log.debug("history prepend unlocked") | |
| 765 # we call manually onScroll, to check if we are still in the scrolling zone | |
| 766 self.onScroll(self.history_scroll, self.history_scroll.scroll_y) | |
| 767 | |
| 768 def _history_scroll_adjust(self, __, scroll_start_height): | |
| 769 # history scroll position must correspond to where it was before new messages | |
| 770 # have been appended | |
| 771 self.history_scroll.scroll_y = ( | |
| 772 scroll_start_height / self.messages_widget.height | |
| 773 ) | |
| 774 | |
| 775 # we want a small delay before unlocking, to avoid re-fetching history | |
| 776 # again | |
| 777 Clock.schedule_once(self._history_unlock, 1.5) | |
| 778 | |
| 779 def _backHistoryGetCb_post(self, __, history, scroll_start_height): | |
| 780 if len(history) == 0: | |
| 781 # we don't unlock self._history_prepend_lock if there is no history, as there | |
| 782 # is no sense to try to retrieve more in this case. | |
| 783 log.debug(f"we've reached top of history for {self.target.bare} chat") | |
| 784 else: | |
| 785 # we have to schedule again for _history_scroll_adjust, else messages_widget | |
| 786 # is not resized (self.messages_widget.height is not yet updated) | |
| 787 # as a result, the scroll_to can't work correctly | |
| 788 Clock.schedule_once(partial( | |
| 789 self._history_scroll_adjust, | |
| 790 scroll_start_height=scroll_start_height)) | |
| 791 log.debug( | |
| 792 f"{len(history)} messages prepended to history (last: {history[0][0]})") | |
| 793 | |
| 794 def _backHistoryGetCb(self, history): | |
| 795 # TODO: factorise with QuickChat._historyGetCb | |
| 796 scroll_start_height = self.messages_widget.height * self.history_scroll.scroll_y | |
| 797 for data in reversed(history): | |
| 798 uid, timestamp, from_jid, to_jid, message, subject, type_, extra = data | |
| 799 from_jid = jid.JID(from_jid) | |
| 800 to_jid = jid.JID(to_jid) | |
| 801 extra["history"] = True | |
| 802 self.messages[uid] = message = quick_chat.Message( | |
| 803 self, | |
| 804 uid, | |
| 805 timestamp, | |
| 806 from_jid, | |
| 807 to_jid, | |
| 808 message, | |
| 809 subject, | |
| 810 type_, | |
| 811 extra, | |
| 812 self.profile, | |
| 813 ) | |
| 814 self.messages.move_to_end(uid, last=False) | |
| 815 self.prependMessage(message) | |
| 816 Clock.schedule_once(partial( | |
| 817 self._backHistoryGetCb_post, | |
| 818 history=history, | |
| 819 scroll_start_height=scroll_start_height)) | |
| 820 | |
| 821 def _backHistoryGetEb(self, failure_): | |
| 822 G.host.addNote( | |
| 823 _("Problem while getting back history"), | |
| 824 _("Can't back history for {target}: {problem}").format( | |
| 825 target=self.target, problem=failure_), | |
| 826 C.XMLUI_DATA_LVL_ERROR) | |
| 827 # we don't unlock self._history_prepend_lock on purpose, no need | |
| 828 # to try to get more history if something is wrong | |
| 829 | |
| 830 def onScroll(self, scroll_view, scroll_y): | |
| 831 if self._history_prepend_lock: | |
| 832 return | |
| 833 if (1-scroll_y) * self.messages_widget.height < INFINITE_SCROLL_LIMIT: | |
| 834 self._history_prepend_lock = True | |
| 835 log.debug(f"Retrieving back history for {self} [{self.history_count}]") | |
| 836 self.history_count += 1 | |
| 837 first_uid = next(iter(self.messages.keys())) | |
| 838 filters = self.history_filters.copy() | |
| 839 filters['before_uid'] = first_uid | |
| 840 self.host.bridge.historyGet( | |
| 841 str(self.host.profiles[self.profile].whoami.bare), | |
| 842 str(self.target), | |
| 843 30, | |
| 844 True, | |
| 845 {k: str(v) for k,v in filters.items()}, | |
| 846 self.profile, | |
| 847 callback=self._backHistoryGetCb, | |
| 848 errback=self._backHistoryGetEb, | |
| 849 ) | |
| 850 | |
| 22 | 851 |
| 852 PLUGIN_INFO["factory"] = Chat.factory | |
| 853 quick_widgets.register(quick_chat.QuickChat, Chat) |