diff options
Diffstat (limited to 'gajim/gtk/conversation/rows/file_transfer_jingle.py')
| -rw-r--r-- | gajim/gtk/conversation/rows/file_transfer_jingle.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gajim/gtk/conversation/rows/file_transfer_jingle.py b/gajim/gtk/conversation/rows/file_transfer_jingle.py index 94ae7e601..ab84bdb66 100644 --- a/gajim/gtk/conversation/rows/file_transfer_jingle.py +++ b/gajim/gtk/conversation/rows/file_transfer_jingle.py @@ -26,7 +26,6 @@ from gi.repository import Gtk from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize -from gajim.common.const import KindConstant from gajim.common.events import FileCompleted from gajim.common.events import FileError from gajim.common.events import FileHashError @@ -43,7 +42,8 @@ from gajim.common.helpers import open_file from gajim.common.helpers import show_in_folder from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact -from gajim.common.storage.archive import ConversationRow +from gajim.common.storage.archive.const import ChatDirection +from gajim.common.storage.archive.structs import DbConversationJoinedData from gajim.gtk.builder import get_builder from gajim.gtk.conversation.rows.base import BaseRow @@ -61,14 +61,14 @@ class FileTransferJingleRow(BaseRow): account: str, contact: BareContact, event: TransferEventT | None = None, - db_message: ConversationRow | None = None + db_row: DbConversationJoinedData | None = None ) -> None: BaseRow.__init__(self, account) self.type = 'file-transfer' - if db_message is not None: - timestamp = db_message.time + if db_row is not None: + timestamp = db_row.timestamp else: timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) @@ -76,14 +76,14 @@ class FileTransferJingleRow(BaseRow): self._contact = contact - if db_message is not None: - assert db_message.additional_data is not None - sid = db_message.additional_data.get_value('gajim', 'sid') - assert sid is not None - self._file_props = FilesProp.getFilePropBySid(sid) + if db_row is not None and db_row.has_filetransfers: + filetransfers = db_row.get_filetransfers() + file_transfer = filetransfers[0] # TODO: Proper processing + self._file_props = FilesProp.getFilePropBySid(file_transfer.source) if self._file_props is None: - log.debug('File prop not found for SID: %s', sid) - self.log_line_id = db_message.log_line_id + log.debug( + 'File prop not found for SID: %s', file_transfer.source) + self.log_line_id = db_row.entitykey else: assert event is not None self._file_props = event.file_props @@ -99,8 +99,8 @@ class FileTransferJingleRow(BaseRow): avatar_placeholder.set_valign(Gtk.Align.START) self.grid.attach(avatar_placeholder, 0, 0, 1, 1) - if db_message is not None: - if db_message.kind == KindConstant.FILE_TRANSFER_INCOMING: + if db_row is not None: + if db_row.direction == ChatDirection.INCOMING: contact = self._contact is_self = True else: @@ -148,7 +148,7 @@ class FileTransferJingleRow(BaseRow): self.show_all() - if db_message is not None: + if db_row is not None: self._reconstruct_transfer() else: assert event is not None |