Daniel Brötzmann pushed to branch storage at gajim / gajim
Commits:
176d7380 by wurstsalat at 2024-04-07T19:22:39+02:00
cfix: FileTransferWindow: Fix Message model attribute
- - - - -
b8e5133c by wurstsalat at 2024-04-07T19:29:37+02:00
cfix: FileTransferJingleRow: Adapt to database layout changes
- - - - -
99549005 by wurstsalat at 2024-04-07T19:30:25+02:00
cfix: Handle calls and file transfers in chat control and chat list
- - - - -
4 changed files:
- gajim/gtk/chat_list_row.py
- gajim/gtk/control.py
- gajim/gtk/conversation/rows/file_transfer_jingle.py
- gajim/gtk/filetransfer.py
Changes:
=====================================
gajim/gtk/chat_list_row.py
=====================================
@@ -190,16 +190,15 @@ def _display_last_conversation_row(self) -> None:
self.stanza_id = message.stanza_id
self.message_id = message.id
- # TODO
- # if message.has_filetransfers:
- # self.set_message_text(
- # _('File'), icon_name='text-x-generic-symbolic')
- # self.set_timestamp(message.timestamp)
-
- # if message.call is not None:
- # self.set_message_text(
- # _('Call'), icon_name='call-start-symbolic')
- # self.set_timestamp(message.timestamp)
+ if message.filetransfers:
+ self.set_message_text(
+ _('File'), icon_name='text-x-generic-symbolic')
+ self.set_timestamp(message.timestamp)
+
+ if message.call is not None:
+ self.set_message_text(
+ _('Call'), icon_name='call-start-symbolic')
+ self.set_timestamp(message.timestamp)
self.show_all()
=====================================
gajim/gtk/control.py
=====================================
@@ -501,14 +501,13 @@ def _add_message(self, db_row: Message) -> None:
self._jump_to_end_button.add_unread_count()
def _add_db_row(self, db_row: Message):
- # TODO
- # if db_row.has_filetransfers:
- # self._scrolled_view.add_jingle_file_transfer(db_row=db_row)
- # return
-
- # if db_row.call is not None:
- # self._scrolled_view.add_call_message(db_row=db_row)
- # return
+ if db_row.filetransfers:
+ self._scrolled_view.add_jingle_file_transfer(db_row=db_row)
+ return
+
+ if db_row.call is not None:
+ self._scrolled_view.add_call_message(db_row=db_row)
+ return
self._scrolled_view.add_message_from_db(db_row)
=====================================
gajim/gtk/conversation/rows/file_transfer_jingle.py
=====================================
@@ -67,12 +67,14 @@ def __init__(self,
self._contact = contact
if db_row is not None and db_row.filetransfers:
+ # TODO: Handle filetransfers and sources specifically
file_transfer = db_row.filetransfers[0]
- source = file_transfer.source
- assert isinstance(source, mod.JingleFT)
- self._file_props = FilesProp.getFilePropBySid(source.sid)
- if self._file_props is None:
- log.debug('File prop not found for SID: %s', source.sid)
+ sources = file_transfer.source
+ for source in sources:
+ if isinstance(source, mod.JingleFT):
+ self._file_props = FilesProp.getFilePropBySid(source.sid)
+ if self._file_props is None:
+ log.debug('File prop not found for SID: %s',
source.sid)
self.log_line_id = db_row.pk
else:
assert event is not None
=====================================
gajim/gtk/filetransfer.py
=====================================
@@ -435,7 +435,7 @@ def send_file(self,
timestamp=utc_now(),
state=MessageState.ACKNOWLEDGED,
id=str(uuid.uuid4()),
- filetransfer=[ft_data],
+ filetransfers=[ft_data],
)
app.storage.archive.insert_object(message_data)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/fee53ce2ea81da288273ad470cad20c225fed5d8...99549005af2598a5f34a1c636c3f37c13ba1658e
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/fee53ce2ea81da288273ad470cad20c225fed5d8...99549005af2598a5f34a1c636c3f37c13ba1658e
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
