Commits October 2021

commits@gajim.org

1 participants
72 discussions

[Git][gajim/gajim][mainwindow] CallRow: Reset session after update
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ccfa888b by wurstsalat at 2021-10-31T23:44:38+01:00 CallRow: Reset session after update - - - - - 1 changed file: - gajim/gtk/conversation/rows/call.py Changes: ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -91,6 +91,7 @@ def update(self): self.grid.attach(label, 2, 0, 1, 1) self.show_all() self._event = None + self._session = None def _on_accept(self, button): button.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ccfa888b0501a48405cae6268da74460… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ccfa888b0501a48405cae6268da74460… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Revert "Control: Reset active control when unselecting chat"
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e4104a9d by wurstsalat at 2021-10-31T23:39:57+01:00 Revert "Control: Reset active control when unselecting chat" This reverts commit d4f2d9f4843e7c1adf175fe32509e14010e48df1. - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -132,7 +132,6 @@ def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): def _on_chat_unselected(self, _chat_list_stack): self._chat_stack.clear() - self._chat_stack.reset_active_control() self._search_view.set_context(None, None) def _on_search_history(self, _action, _param): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -105,10 +105,6 @@ def show_chat(self, account, jid): self._active_control = control GLib.idle_add(control.focus) - def reset_active_control(self): - self._active_control.reset_view() - self._active_control = None - def clear(self): self.set_visible_child_name('empty') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4104a9d29f7132fd7dc2a1ac30deb1c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4104a9d29f7132fd7dc2a1ac30deb1c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Control: Reset active control when unselecting chat
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: d4f2d9f4 by wurstsalat at 2021-10-31T23:03:05+01:00 Control: Reset active control when unselecting chat - - - - - 1edcd9dc by wurstsalat at 2021-10-31T23:15:01+01:00 CallRow: Update row correctly - - - - - 3 changed files: - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/conversation/rows/call.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -132,6 +132,7 @@ def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): def _on_chat_unselected(self, _chat_list_stack): self._chat_stack.clear() + self._chat_stack.reset_active_control() self._search_view.set_context(None, None) def _on_search_history(self, _action, _param): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -105,6 +105,10 @@ def show_chat(self, account, jid): self._active_control = control GLib.idle_add(control.focus) + def reset_active_control(self): + self._active_control.reset_view() + self._active_control = None + def clear(self): self.set_visible_child_name('empty') ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -48,8 +48,8 @@ def __init__(self, account, contact, event=None, db_message=None): if is_from_db: sid = db_message.additional_data.get_value('gajim', 'sid') - self._session = self._client.get_module('Jingle').get_jingle_session( - self._contact.jid, sid) + module = self._client.get_module('Jingle') + self._session = module.get_jingle_session(self._contact.jid, sid) avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) @@ -76,7 +76,7 @@ def __init__(self, account, contact, event=None, db_message=None): self.show_all() def update(self): - if self._event is None: + if self._event is None and self._session is None: return self._call_box.destroy() @@ -87,8 +87,7 @@ def update(self): label = SimpleLabel() label.get_style_context().add_class('dim-label') - text = _('%s called you') % self._contact.name - label.set_text(text) + label.set_text(_('Call')) self.grid.attach(label, 2, 0, 1, 1) self.show_all() self._event = None @@ -112,6 +111,7 @@ def _on_reject(self, button): self.get_parent().reject_call(session) else: self.get_parent().reject_call(self._session) + self._session = None def _prepare_incoming_call(self): self._call_box = Gtk.Box( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af52f23fa1198aabbaf1221f322ddb3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af52f23fa1198aabbaf1221f322ddb3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Calls: Store and load events from DB
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: af52f23f by wurstsalat at 2021-10-31T22:38:40+01:00 Calls: Store and load events from DB - - - - - 8 changed files: - gajim/common/const.py - gajim/common/jingle_session.py - gajim/gtk/call_widget.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/const.py ===================================== @@ -70,6 +70,7 @@ class KindConstant(IntEnum): CHAT_MSG_SENT = 6 ERROR = 7 FILE_TRANSFER = 8 + CALL = 9 def __str__(self): return str(self.value) ===================================== gajim/common/jingle_session.py ===================================== @@ -27,14 +27,18 @@ # - Tie-breaking # * timeout +import time import logging from enum import Enum, unique import nbxmpp +from nbxmpp import JID from nbxmpp.namespaces import Namespace from nbxmpp.util import generate_id from gajim.common import app +from gajim.common.const import KindConstant +from gajim.common.helpers import AdditionalDataDict from gajim.common.jingle_transport import get_jingle_transport from gajim.common.jingle_transport import JingleTransportIBB from gajim.common.jingle_content import get_jingle_content @@ -581,6 +585,25 @@ def __on_session_initiate(self, stanza, jingle, error, action): # Send event about starting a session self._raise_event('jingle-request-received', contents=contents) + # Check if it's an A/V call and add it to the archive + content_types = [] + for item in contents: + content_types.append(item.media) + if not any(item in ('audio', 'video') for item in content_types): + return + + account = self.connection.name + jid = JID.from_string(self.peerjid) + timestamp = time.time() + additional_data = AdditionalDataDict() + additional_data.set_value('gajim', 'sid', self.sid) + app.storage.archive.insert_into_logs( + account, + jid.bare, + timestamp, + KindConstant.CALL, + additional_data=additional_data) + def __broadcast(self, stanza, jingle, error, action): """ Broadcast the stanza contents to proper content handlers ===================================== gajim/gtk/call_widget.py ===================================== @@ -271,9 +271,7 @@ def start_call(self): self._jingle['video'].available) self._ui.av_cam_button.set_sensitive(False) - def accept_call(self, event): - session = self._client.get_module('Jingle').get_jingle_session( - event.fjid, event.sid) + def accept_call(self, session): if not session: return @@ -282,28 +280,33 @@ def accept_call(self, event): if audio and not audio.negotiated: self._set_jingle_state( - 'audio', JingleState.CONNECTING, event.sid) + 'audio', JingleState.CONNECTING, session.sid) if video and not video.negotiated: self._set_jingle_state( - 'video', JingleState.CONNECTING, event.sid) + 'video', JingleState.CONNECTING, session.sid) if not session.accepted: session.approve_session() - for item in event.contents: - session.approve_content(item.media) + if audio is not None: + session.approve_content('audio') + if video is not None: + session.approve_content('video') - def reject_call(self, event): - session = self._client.get_module('Jingle').get_jingle_session( - event.fjid, event.sid) + def reject_call(self, session): if not session: return + audio = session.get_content('audio') + video = session.get_content('video') + if not session.accepted: session.decline_session() else: - for item in event.contents: - session.reject_content(item.media) + if audio is not None: + session.reject_content('audio') + if video is not None: + session.reject_content('video') def _update_audio(self): audio_state = self._jingle['audio'].state ===================================== gajim/gtk/chat_list.py ===================================== @@ -470,6 +470,12 @@ def __init__(self, workspace_id, account, jid, type_, pinned): uf_timestamp = get_uf_relative_time(line.time) self._ui.timestamp_label.set_text(uf_timestamp) + if line.kind == KindConstant.CALL: + self._ui.message_label.set_text(_('Call')) + self.timestamp = line.time + uf_timestamp = get_uf_relative_time(line.time) + self._ui.timestamp_label.set_text(uf_timestamp) + self.show_all() @property ===================================== gajim/gtk/controls/base.py ===================================== @@ -1091,8 +1091,10 @@ def add_jingle_file_transfer(self, event): if self._scrolled_view.get_lower_complete() and control_selected: self.conversation_view.add_jingle_file_transfer(event) - def add_call_message(self, timestamp, text, event=None): - self.conversation_view.add_call_message(timestamp, text, event) + def add_call_message(self, event): + control_selected = bool(self == app.window.get_active_control()) + if self._scrolled_view.get_lower_complete() and control_selected: + self.conversation_view.add_call_message(event=event) def add_message(self, text, @@ -1364,6 +1366,10 @@ def add_messages(self, messages): db_message=msg) continue + if msg.kind == KindConstant.CALL: + self.conversation_view.add_call_message(db_message=msg) + continue + if not msg.message: continue ===================================== gajim/gtk/controls/chat.py ===================================== @@ -488,17 +488,17 @@ def _on_start_call(self): def _process_jingle_av_event(self, event): self._call_widget.process_event(event) - def _on_accept_call(self, _view, event): - self._call_widget.accept_call(event) + def _on_accept_call(self, _view, session): + self._call_widget.accept_call(session) - def _on_reject_call(self, _view, event): - self._call_widget.reject_call(event) + def _on_reject_call(self, _view, session): + self._call_widget.reject_call(session) def _on_call_ended(self, _call_widget): self.conversation_view.update_call_rows() def _add_incoming_call(self, _call_widget, event): - self.add_call_message(time.time(), '', event=event) + self.add_call_message(event) def on_location_eventbox_button_release_event(self, _widget, _event): return ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -17,6 +17,7 @@ from gi.repository import Gtk +from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ @@ -25,29 +26,43 @@ class CallRow(BaseRow): - def __init__(self, account, contact, timestamp, text, event=None): + def __init__(self, account, contact, event=None, db_message=None): BaseRow.__init__(self, account) self.type = 'call' - timestamp = time.time() + + self._client = app.get_client(account) + + is_from_db = bool(db_message is not None) + + if is_from_db: + timestamp = db_message.time + else: + timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp self._contact = contact self._event = event + self._session = None + + if is_from_db: + sid = db_message.additional_data.get_value('gajim', 'sid') + self._session = self._client.get_module('Jingle').get_jingle_session( + self._contact.jid, sid) avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) self.grid.attach(avatar_placeholder, 0, 0, 1, 1) - if event is None: + if event is None and self._session is None: icon = Gtk.Image.new_from_icon_name('call-start-symbolic', Gtk.IconSize.MENU) self.grid.attach(icon, 1, 0, 1, 1) label = SimpleLabel() label.get_style_context().add_class('dim-label') - label.set_text(text) + label.set_text(_('Call')) self.grid.attach(label, 2, 0, 1, 1) else: self._prepare_incoming_call() @@ -81,12 +96,22 @@ def update(self): def _on_accept(self, button): button.set_sensitive(False) self._reject_button.set_sensitive(False) - self.get_parent().accept_call(self._event) + if self._event is not None: + session = self._client.get_module('Jingle').get_jingle_session( + self._event.fjid, self._event.sid) + self.get_parent().accept_call(session) + else: + self.get_parent().accept_call(self._session) def _on_reject(self, button): button.set_sensitive(False) self._accept_button.set_sensitive(False) - self.get_parent().reject_call(self._event) + if self._event is not None: + session = self._client.get_module('Jingle').get_jingle_session( + self._event.fjid, self._event.sid) + self.get_parent().reject_call(session) + else: + self.get_parent().reject_call(self._session) def _prepare_incoming_call(self): self._call_box = Gtk.Box( @@ -104,8 +129,15 @@ def _prepare_incoming_call(self): self._call_box.add(avatar_image) content_types = [] - for item in self._event.contents: - content_types.append(item.media) + if self._event is not None: + for item in self._event.contents: + content_types.append(item.media) + if self._session is not None: + if self._session.get_content('audio') is not None: + content_types.append('audio') + if self._session.get_content('video') is not None: + content_types.append('video') + text = _('%s is calling') % self._contact.name if 'video' in content_types: text += _(' (Video Call)') @@ -118,6 +150,7 @@ def _prepare_incoming_call(self): self._call_box.add(label) self._accept_button = Gtk.Button.new_with_label(_('Accept Call')) + self._accept_button.get_style_context().add_class('suggested-action') self._accept_button.connect('clicked', self._on_accept) self._reject_button = Gtk.Button.new_with_label(_('Reject')) @@ -125,8 +158,8 @@ def _prepare_incoming_call(self): button_box = Gtk.Box(spacing=12) button_box.set_halign(Gtk.Align.CENTER) - button_box.add(self._accept_button) button_box.add(self._reject_button) + button_box.add(self._accept_button) self._call_box.add(button_box) self.grid.attach(self._call_box, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -193,12 +193,9 @@ def add_jingle_file_transfer(self, event=None, db_message=None): self._account, self._contact, event=event, db_message=db_message) self._insert_message(jingle_transfer_row) - def add_call_message(self, timestamp, text, event): - call_row = CallRow(self._account, - self._contact, - timestamp, - text, - event) + def add_call_message(self, event=None, db_message=None): + call_row = CallRow( + self._account, self._contact, event=event, db_message=db_message) self._insert_message(call_row) def add_command_output(self, text, is_error): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af52f23fa1198aabbaf1221f322ddb31… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af52f23fa1198aabbaf1221f322ddb31… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AV: Fix notification
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f62b8bfe by wurstsalat at 2021-10-31T20:58:02+01:00 AV: Fix notification - - - - - 3 changed files: - gajim/gtk/call_widget.py - gajim/gtk/notification.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/call_widget.py ===================================== @@ -206,16 +206,13 @@ def _on_jingle_request(self, event): # There is no voice call running running yet self.emit('incoming-call', event) - contact = self._client.get_module('Contacts').get_contact( - event.jid) - app.nec.push_incoming_event( NetworkEvent('notification', - account=self.account, - jid=self.contact.jid, - notif_type='jingle-incoming', + account=self._account, + jid=self._contact.jid, + notif_type='incoming-call', title=_('Incoming Call'), - text=_('%s is calling') % contact.name)) + text=_('%s is calling') % self._contact.name)) def _on_jingle_connected(self, event): session = self._client.get_module('Jingle').get_jingle_session( ===================================== gajim/gtk/notification.py ===================================== @@ -52,7 +52,7 @@ NOTIFICATION_ICONS = { 'incoming-message': 'gajim-chat_msg_recv', 'group-chat-invitation': 'gajim-gc_invitation', - 'jingle-incoming': 'call-start-symbolic', + 'incoming-call': 'call-start-symbolic', 'subscription_request': 'gajim-subscription_request', 'unsubscribed': 'gajim-unsubscribed', 'file-request-received': 'document-send', ===================================== gajim/gui_interface.py ===================================== @@ -234,7 +234,7 @@ def handle_event(self, account, jid, notif_detail): app.window.select_chat(account, jid) elif notif_detail in ('chat-message', 'group-chat-message'): app.window.select_chat(account, jid.bare) - elif notif_detail == 'jingle-incoming': + elif notif_detail == 'incoming-call': app.window.select_chat(account, jid.bare) elif notif_detail == 'file-request-received': app.window.select_chat(account, jid.bare) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f62b8bfe546763db48b279d69634d996… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f62b8bfe546763db48b279d69634d996… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Workspace: Add removal confirmation
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 78bf8ae2 by wurstsalat at 2021-10-31T17:36:42+01:00 Workspace: Add removal confirmation - - - - - f2931af5 by wurstsalat at 2021-10-31T17:46:01+01:00 ChatList: Show move to workspace only if we have more than one - - - - - 5 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/workspace_dialog.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -277,17 +277,19 @@ def toggle_chat_pinned(self, account, jid): row.toggle_pinned() self.invalidate_sort() - def remove_chat(self, account, jid): + def remove_chat(self, account, jid, emit_unread=True): row = self._chats.pop((account, jid)) self.remove(row) row.destroy() - self.emit_unread_changed() + if emit_unread: + self.emit_unread_changed() def remove_chats_for_account(self, account): for row_account, jid in list(self._chats.keys()): if row_account != account: continue self.remove_chat(account, jid) + self.emit_unread_changed() def get_selected_chat(self): row = self.get_selected_row() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -209,7 +209,7 @@ def _move_chat_to_workspace(self, _action, param): def remove_chat(self, workspace_id, account, jid): chat_list = self._chat_lists[workspace_id] type_ = chat_list.get_chat_type(account, jid) - chat_list.remove_chat(account, jid) + chat_list.remove_chat(account, jid, emit_unread=False) self.store_open_chats(workspace_id) self.emit('chat-removed', account, jid, type_) ===================================== gajim/gtk/main.py ===================================== @@ -380,6 +380,10 @@ def update_workspace(self, workspace_id): self._chat_page.update_workspace(workspace_id) self._workspace_side_bar.update_avatar(workspace_id) + def get_chat_list(self, workspace_id): + chat_list_stack = self._chat_page.get_chat_list_stack() + return chat_list_stack.get_chatlist(workspace_id) + def _add_group_chat(self, _action, param): self.add_group_chat(**param.unpack()) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -21,6 +21,8 @@ from .avatar import make_workspace_avatar from .avatar_selector import AvatarSelector +from .dialogs import ConfirmationDialog +from .dialogs import DialogButton from .util import get_builder from .util import rgba_to_float from .util import make_rgba @@ -83,8 +85,24 @@ def _on_key_press_event(self, _widget, event): self.destroy() def _on_remove_workspace(self, _button): - app.window.remove_workspace(self._workspace_id) - self.destroy() + def _on_remove(): + app.window.remove_workspace(self._workspace_id) + self.destroy() + + chat_list = app.window.get_chat_list(self._workspace_id) + open_chats = chat_list.get_open_chats() + if len(open_chats) > 0: + ConfirmationDialog( + _('Remove Workspace'), + _('Remove Workspace'), + _('This workspace contains chats. Remove anyway?'), + [DialogButton.make('Cancel', + text=_('_No')), + DialogButton.make('Remove', + callback=_on_remove)]).show() + return + # No chats in chat list, it is save to remove workspace + _on_remove() def _on_cancel(self, _button): self.destroy() ===================================== gajim/gui_menu_builder.py ===================================== @@ -388,9 +388,12 @@ def get_chat_list_row_menu(workspace_id, account, jid, pinned): menu_items = [ ('toggle-chat-pinned', toggle_label), - (_('Move Chat'), []), ] + workspaces = app.settings.get_workspaces() + if len(workspaces) > 1: + menu_items.append((_('Move Chat'), [])) + is_self_contact = contact.jid.bare == client.get_own_jid().bare pm_with_jid = contact.is_pm_contact and contact.real_jid is not None if (not contact.is_groupchat and not contact.is_in_roster and @@ -409,8 +412,10 @@ def get_chat_list_row_menu(workspace_id, account, jid, pinned): menu.append_item(menuitem) else: # This is a submenu - submenu = build_workspaces_submenu(workspace_id, account, str(jid)) - menu.append_submenu(item[0], submenu) + if len(workspaces) > 1: + submenu = build_workspaces_submenu( + workspace_id, account, str(jid)) + menu.append_submenu(item[0], submenu) return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b38b74fa10b61ae9e6448e06d011c72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b38b74fa10b61ae9e6448e06d011c72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Interface: Use present_with_time to show main window
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b38b74fa by wurstsalat at 2021-10-31T16:13:37+01:00 Interface: Use present_with_time to show main window - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -243,7 +243,7 @@ def handle_event(self, account, jid, notif_detail): 'group-chat-invitation'): app.window.show_account_page(account) - app.window.present() + app.window.present_with_time(Gtk.get_current_event_time()) @staticmethod def handle_event_information(event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b38b74fa10b61ae9e6448e06d011c728… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b38b74fa10b61ae9e6448e06d011c728… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Jingle File Transfers: Store and load transfer events from DB
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1d4414bc by wurstsalat at 2021-10-31T13:56:36+01:00 Jingle File Transfers: Store and load transfer events from DB - - - - - 7 changed files: - gajim/common/const.py - gajim/common/jingle_ft.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/view.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/common/const.py ===================================== @@ -69,6 +69,7 @@ class KindConstant(IntEnum): SINGLE_MSG_SENT = 5 CHAT_MSG_SENT = 6 ERROR = 7 + FILE_TRANSFER = 8 def __str__(self): return str(self.value) ===================================== gajim/common/jingle_ft.py ===================================== @@ -16,20 +16,23 @@ Handles Jingle File Transfer (XEP 0234) """ -import hashlib import logging import threading +import time from enum import IntEnum, unique import nbxmpp +from nbxmpp import JID from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common import configpaths +from gajim.common.const import KindConstant from gajim.common import jingle_xtls from gajim.common.jingle_content import contents, JingleContent from gajim.common.jingle_transport import JingleTransportSocks5, TransportType from gajim.common import helpers +from gajim.common.helpers import AdditionalDataDict from gajim.common.connection_handlers_events import FileRequestReceivedEvent from gajim.common.jingle_ftstates import ( StateInitialized, StateCandSent, StateCandReceived, StateTransfering, @@ -128,11 +131,29 @@ def __state_changed(self, nextstate, args=None): def __on_session_initiate(self, stanza, content, error, action): log.debug("Jingle FT request received") - app.nec.push_incoming_event(FileRequestReceivedEvent(None, - conn=self.session.connection, - stanza=stanza, - jingle_content=content, - FT_content=self)) + app.nec.push_incoming_event( + FileRequestReceivedEvent(None, + conn=self.session.connection, + stanza=stanza, + jingle_content=content, + FT_content=self)) + + account = self.session.connection.name + jid = self.session.connection.get_module('Bytestream')._ft_get_from( + stanza) + jid = JID.from_string(jid) + sid = stanza.getTag('jingle').getAttr('sid') + timestamp = time.time() + additional_data = AdditionalDataDict() + additional_data.set_value('gajim', 'type', 'jingle') + additional_data.set_value('gajim', 'sid', sid) + app.storage.archive.insert_into_logs( + account, + jid.bare, + timestamp, + KindConstant.FILE_TRANSFER, + additional_data=additional_data) + if self.session.request: # accept the request self.session.approve_content(self.media, self.name) ===================================== gajim/gtk/chat_list.py ===================================== @@ -437,7 +437,12 @@ def __init__(self, workspace_id, account, jid, type_, pinned): # Get last chat message from archive line = app.storage.archive.get_last_conversation_line(account, jid) - if line is not None and line.message is not None: + + if line is None: + self.show_all() + return + + if line.message is not None: self.set_message_text(line.message, line.additional_data) if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): @@ -457,6 +462,12 @@ def __init__(self, workspace_id, account, jid, type_, pinned): uf_timestamp = get_uf_relative_time(line.time) self._ui.timestamp_label.set_text(uf_timestamp) + if line.kind == KindConstant.FILE_TRANSFER: + self._ui.message_label.set_text(_('File Transfer')) + self.timestamp = line.time + uf_timestamp = get_uf_relative_time(line.time) + self._ui.timestamp_label.set_text(uf_timestamp) + self.show_all() @property @@ -613,7 +624,7 @@ def set_message_text(self, text, additional_data): if app.interface.preview_manager.get_previewable(text, additional_data): file_name = filename_from_uri(text) icon, file_type = guess_simple_file_type(text) - text = _('%(file_type)s (%(file_name)s)') % { + text = '%(file_type)s (%(file_name)s)' % { 'file_type': file_type, 'file_name': file_name} else: ===================================== gajim/gtk/controls/base.py ===================================== @@ -283,7 +283,7 @@ def process_event(self, event): self._process_jingle_av_event(event) return if event.name in ('file-request-received', 'file-request-sent'): - self.add_jingle_file_transfer(event) + self.add_jingle_file_transfer(event=event) return method_name = event.name.replace('-', '_') @@ -1087,7 +1087,9 @@ def add_file_transfer(self, transfer): self.conversation_view.add_file_transfer(transfer) def add_jingle_file_transfer(self, event): - self.conversation_view.add_jingle_file_transfer(event) + control_selected = bool(self == app.window.get_active_control()) + if self._scrolled_view.get_lower_complete() and control_selected: + self.conversation_view.add_jingle_file_transfer(event) def add_call_message(self, timestamp, text, event=None): self.conversation_view.add_call_message(timestamp, text, event) @@ -1107,10 +1109,8 @@ def add_message(self, if additional_data is None: additional_data = AdditionalDataDict() - chat_active = app.window.is_chat_active( - self.account, self.contact.jid) - - if self._scrolled_view.get_lower_complete() and chat_active: + control_selected = bool(self == app.window.get_active_control()) + if self._scrolled_view.get_lower_complete() and control_selected: self.conversation_view.add_message( text, kind, @@ -1144,6 +1144,8 @@ def add_message(self, self._notify(name, text, tim) # Send chat marker if we’re actively following the chat + chat_active = app.window.is_chat_active( + self.account, self.contact.jid) if chat_active and self._scrolled_view.get_autoscroll(): app.window.mark_as_read(self.account, self.contact.jid) @@ -1356,7 +1358,13 @@ def fetch_n_lines_history(self, _scrolled, before, n_lines): def add_messages(self, messages): for msg in messages: - if not msg or not msg.message: + if msg.kind == KindConstant.FILE_TRANSFER: + if msg.additional_data.get_value('gajim', 'type') == 'jingle': + self.conversation_view.add_jingle_file_transfer( + db_message=msg) + continue + + if not msg.message: continue contact_name = msg.contact_name ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -12,6 +12,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging import os import time from datetime import datetime @@ -22,6 +23,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file from gajim.common.i18n import _ @@ -29,18 +31,33 @@ from ...util import get_builder from ...util import format_eta +log = logging.getLogger('gajim.gui.conversation.rows.file_transfer_jingle') + class FileTransferJingleRow(BaseRow): - def __init__(self, account, contact, event): + def __init__(self, account, contact, event=None, db_message=None): BaseRow.__init__(self, account) self.type = 'file-transfer' - timestamp = time.time() + + is_from_db = bool(db_message is not None) + + if is_from_db: + timestamp = db_message.time + else: + timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp self._contact = contact - self._file_props = event.file_props + + if is_from_db: + sid = db_message.additional_data.get_value('gajim', 'sid') + self._file_props = FilesProp.getFilePropBySid(sid) + if self._file_props is None: + log.debug('File props not found for SID: %s', sid) + else: + self._file_props = event.file_props self._start_time = 0 if app.settings.get('use_kib_mib'): @@ -63,6 +80,16 @@ def __init__(self, account, contact, event): self._ui.connect_signals(self) + self.show_all() + + if is_from_db: + self._reconstruct_transfer() + else: + self._display_transfer_info(event.name) + + if self._file_props is None: + return + # pylint: disable=line-too-long app.ged.register_event_handler('file-completed', ged.GUI1, self.process_event) app.ged.register_event_handler('file-hash-error', ged.GUI1, self.process_event) @@ -74,16 +101,44 @@ def __init__(self, account, contact, event): app.ged.register_event_handler('jingle-ft-cancelled-received', ged.GUI1, self.process_event) # pylint: enable=line-too-long - self.show_all() + def _reconstruct_transfer(self): + self._show_file_infos() + if self._file_props is None: + self._ui.transfer_action.set_text(_('File Transfer')) + self._ui.error_label.set_text(_('No info available')) + self._ui.action_stack.set_visible_child_name('error') + return - self._display_transfer_info(event) + if self._file_props.completed: + self._show_completed() + return + + if self._file_props.stopped: + self._ui.action_stack.set_visible_child_name('error') + self._ui.transfer_action.set_text(_('File Transfer Stopped')) + self._ui.error_label.set_text('') + return + + if self._file_props.error is not None: + self._show_error(self._file_props) + return - def _display_transfer_info(self, event): - if event.name == 'file-request-sent': + self._ui.transfer_action.set_text(_('File Offered…')) + + def _display_transfer_info(self, event_name): + if event_name == 'file-request-sent': self._ui.action_stack.set_visible_child_name('progress') self._ui.progress_label.set_text(_('Waiting…')) self._ui.transfer_action.set_text(_('File Offered…')) + self._show_file_infos() + + def _show_file_infos(self): + if self._file_props is None: + self._ui.file_name.hide() + self._ui.file_description.hide() + self._ui.file_size.hide() + return file_name = GLib.markup_escape_text(self._file_props.name) if self._file_props.mime_type: @@ -127,7 +182,7 @@ def process_event(self, event): if event.name == 'file-completed': self._show_completed() elif event.name == 'file-error': - self._show_error(event) + self._show_error(event.file_props) elif event.name == 'file-hash-error': self._ui.action_stack.set_visible_child_name('hash-error') self._ui.transfer_action.set_text(_('File Verification Failed')) @@ -153,7 +208,10 @@ def _update_progress(self, file_props): if file_props.type_ == 's': # We're sending a file if self._start_time == 0: - self._start_time = time.time() + self._start_time = time_now + return + if not file_props.transfered_size: + return transferred_size = file_props.transfered_size[-1][1] else: # We're receiving a file @@ -180,15 +238,15 @@ def _update_progress(self, file_props): self._ui.progress_bar.set_fraction(progress) - def _show_error(self, event): + def _show_error(self, file_props): self._ui.action_stack.set_visible_child_name('error') self._ui.transfer_action.set_text(_('File Transfer Stopped')) - if event.file_props.error == -1: + if file_props.error == -1: self._ui.error_label.set_text( _('%s stopped the transfer') % self._contact.name) - elif event.file_props.error == -6: + elif file_props.error == -6: self._ui.error_label.set_text(_('Error opening file')) - elif event.file_props.error == -12: + elif file_props.error == -12: self._ui.error_label.set_text(_('SSL certificate error')) else: self._ui.error_label.set_text(_('An error occurred')) @@ -205,6 +263,7 @@ def _on_accept_file_request(self, _widget): def _on_reject_file_request(self, _widget): self._client.get_module('Bytestream').send_file_rejection( self._file_props) + self._file_props.stopped = True self._ui.action_stack.set_visible_child_name('rejected') self._ui.transfer_action.set_text(_('File Transfer Cancelled')) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -188,9 +188,9 @@ def add_file_transfer(self, transfer): transfer_row = FileTransferRow(self._account, transfer) self._insert_message(transfer_row) - def add_jingle_file_transfer(self, event): + def add_jingle_file_transfer(self, event=None, db_message=None): jingle_transfer_row = FileTransferJingleRow( - self._account, self._contact, event) + self._account, self._contact, event=event, db_message=db_message) self._insert_message(jingle_transfer_row) def add_call_message(self, timestamp, text, event): ===================================== gajim/gtk/filetransfer.py ===================================== @@ -32,10 +32,12 @@ from gajim.common import app from gajim.common import ged from gajim.common import helpers +from gajim.common.const import KindConstant from gajim.common.i18n import _ from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file from gajim.common.helpers import file_is_locked +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.bytestream import is_transfer_active from gajim.common.modules.bytestream import is_transfer_paused from gajim.common.modules.bytestream import is_transfer_stopped @@ -404,6 +406,17 @@ def send_file(self, account, contact, resource_jid, file_path, if file_props is None: return False + # Insert file request into DB + additional_data = AdditionalDataDict() + additional_data.set_value('gajim', 'type', 'jingle') + additional_data.set_value('gajim', 'sid', file_props.sid) + app.storage.archive.insert_into_logs( + account, + contact.jid.bare, + time.time(), + KindConstant.FILE_TRANSFER, + additional_data=additional_data) + client = app.get_client(account) client.get_module('Jingle').start_file_transfer( str(resource_jid), file_props) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d4414bc99a2a7b9b7f25d8f5e72d1f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d4414bc99a2a7b9b7f25d8f5e72d1f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatStack: Reset active control when removing it
by Daniel Brötzmann (＠wurstsalat) 30 Oct '21

30 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e257a81b by wurstsalat at 2021-10-31T01:15:40+02:00 ChatStack: Reset active control when removing it - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -91,6 +91,8 @@ def add_private_chat(self, account, jid): def remove_chat(self, account, jid): control = self._controls.pop((account, jid)) + if control == self._active_control: + self._active_control = None self.remove(control.widget) control.shutdown() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e257a81ba8530d5612090b6fcaa4dc48… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e257a81ba8530d5612090b6fcaa4dc48… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ConversationView: Read marker improvements
by Daniel Brötzmann (＠wurstsalat) 30 Oct '21

30 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1d81a63c by wurstsalat at 2021-10-30T21:25:38+02:00 ConversationView: Read marker improvements - - - - - 2 changed files: - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -26,6 +26,7 @@ def __init__(self, account, contact): BaseRow.__init__(self, account, widget='label') self.type = 'read_marker' self.timestamp = datetime.fromtimestamp(0) + self._last_incoming_timestamp = datetime.fromtimestamp(0) contact.connect('nickname-update', self._on_nickname_update) @@ -43,7 +44,15 @@ def _on_nickname_update(self, contact, _signal_name): self.label.set_text(text) def set_timestamp(self, timestamp): + if timestamp < self._last_incoming_timestamp: + return + self.timestamp = timestamp + self.changed() self.set_no_show_all(False) self.show_all() + + def set_last_incoming_timestamp(self, timestamp): + if timestamp > self._last_incoming_timestamp: + self._last_incoming_timestamp = timestamp ===================================== gajim/gtk/conversation/view.py ===================================== @@ -243,17 +243,24 @@ def add_message(self, if message.type == 'chat': self._message_id_row_map[message_id] = message + + if kind == 'incoming': + self._read_marker_row.set_last_incoming_timestamp( + message.timestamp) if marker is not None and marker == 'displayed': self.set_read_marker(message_id) + self._insert_message(message) def _insert_message(self, message): self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) + if message.kind == 'incoming': if message.timestamp > self._read_marker_row.timestamp: self._read_marker_row.hide() + GLib.idle_add(message.queue_resize) def _add_date_row(self, timestamp): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d81a63c2e9b79f25547ee4d2a666ec4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d81a63c2e9b79f25547ee4d2a666ec4… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2021