diff --git a/gajim/common/client.py b/gajim/common/client.py
index 17a0eae7ffb09d9ed33997bb28f87cb609c07b80..81f859f02678fd6b4f4d48b13b0ea89f793837a5 100644
--- a/gajim/common/client.py
+++ b/gajim/common/client.py
@@ -37,7 +37,6 @@
from gajim.common.idle import Monitor
from gajim.common.i18n import _
-from gajim.common.connection_handlers import ConnectionHandlers
from gajim.common.connection_handlers_events import MessageSentEvent
from gajim.gui.util import open_window
@@ -46,7 +45,7 @@
log = logging.getLogger('gajim.client')
-class Client(ConnectionHandlers):
+class Client:
def __init__(self, account):
self._client = None
self._account = account
@@ -91,8 +90,6 @@ def __init__(self, account):
self._screensaver_handler_id = app.app.connect(
'notify::screensaver-active', self._screensaver_state_changed)
- ConnectionHandlers.__init__(self)
-
def _set_state(self, state):
log.info('State: %s', state)
self._state = state
@@ -286,7 +283,6 @@ def _after_disconnect(self):
self.get_module('VCardAvatars').avatar_advertised = False
app.proxy65_manager.disconnect(self._client)
- self.terminate_sessions()
self.get_module('Bytestream').remove_all_transfers()
if self._destroy_client:
diff --git a/gajim/common/connection_handlers.py b/gajim/common/connection_handlers.py
deleted file mode 100644
index af22f93dbbe549ba2115ba8d6c252b6bc73f66de..0000000000000000000000000000000000000000
--- a/gajim/common/connection_handlers.py
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com>
-# Junglecow J <junglecow AT gmail.com>
-# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org>
-# Travis Shirk <travis AT pobox.com>
-# Nikos Kouremenos <kourem AT gmail.com>
-# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org>
-# Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com>
-# Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com>
-# Jean-Marie Traissard <jim AT lapin.org>
-# Stephan Erb <steve-e AT h3c.de>
-# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
-#
-# This file is part of Gajim.
-#
-# Gajim is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; version 3 only.
-#
-# Gajim is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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 operator
-
-import nbxmpp
-
-from gajim.common import app
-from gajim.common.connection_handlers_events import PresenceReceivedEvent
-from gajim.common.connection_handlers_events import NotificationEvent
-
-
-log = logging.getLogger('gajim.c.connection_handlers')
-
-# basic connection handlers used here and in zeroconf
-class ConnectionHandlersBase:
- def __init__(self):
- # keep track of sessions this connection has with other JIDs
- self.sessions = {}
-
- def get_sessions(self, jid):
- """
- Get all sessions for the given full jid
- """
- if not app.interface.is_pm_contact(jid, self.name):
- jid = app.get_jid_without_resource(jid)
-
- try:
- return list(self.sessions[jid].values())
- except KeyError:
- return []
-
- def get_or_create_session(self, fjid, thread_id):
- """
- Return an existing session between this connection and 'jid', returns a
- new one if none exist
- """
- pm = True
- jid = fjid
-
- if not app.interface.is_pm_contact(fjid, self.name):
- pm = False
- jid = app.get_jid_without_resource(fjid)
-
- session = self.find_session(jid, thread_id)
-
- if session:
- return session
-
- if pm:
- return self.make_new_session(fjid, thread_id, type_='pm')
- return self.make_new_session(fjid, thread_id)
-
- def find_session(self, jid, thread_id):
- try:
- if not thread_id:
- return self.find_null_session(jid)
- return self.sessions[jid][thread_id]
- except KeyError:
- return None
-
- def terminate_sessions(self):
- self.sessions = {}
-
- def delete_session(self, jid, thread_id):
- if not jid in self.sessions:
- jid = app.get_jid_without_resource(jid)
- if not jid in self.sessions:
- return
-
- del self.sessions[jid][thread_id]
-
- if not self.sessions[jid]:
- del self.sessions[jid]
-
- def find_null_session(self, jid):
- """
- Find all of the sessions between us and a remote jid in which we haven't
- received a thread_id yet and returns the session that we last sent a
- message to
- """
- sessions = list(self.sessions[jid].values())
-
- # sessions that we haven't received a thread ID in
- idless = [s for s in sessions if not s.received_thread_id]
-
- # filter out everything except the default session type
- chat_sessions = [s for s in idless if isinstance(s,
- app.default_session_type)]
-
- if chat_sessions:
- # return the session that we last sent a message in
- return sorted(chat_sessions,
- key=operator.attrgetter('last_send'))[-1]
- return None
-
- def get_latest_session(self, jid):
- """
- Get the session that we last sent a message to
- """
- if jid not in self.sessions:
- return None
- sessions = self.sessions[jid].values()
- if not sessions:
- return None
- return sorted(sessions, key=operator.attrgetter('last_send'))[-1]
-
- def find_controlless_session(self, jid, resource=None):
- """
- Find an active session that doesn't have a control attached
- """
- try:
- sessions = list(self.sessions[jid].values())
-
- # filter out everything except the default session type
- chat_sessions = [s for s in sessions if isinstance(s,
- app.default_session_type)]
-
- orphaned = [s for s in chat_sessions if not s.control]
-
- if resource:
- orphaned = [s for s in orphaned if s.resource == resource]
-
- return orphaned[0]
- except (KeyError, IndexError):
- return None
-
- def make_new_session(self, jid, thread_id=None, type_='chat', cls=None):
- """
- Create and register a new session
-
- thread_id=None to generate one.
- type_ should be 'chat' or 'pm'.
- """
- if not cls:
- cls = app.default_session_type
-
- sess = cls(self, nbxmpp.JID.from_string(jid), thread_id, type_)
-
- # determine if this session is a pm session
- # if not, discard the resource so that all sessions are stored bare
- if type_ != 'pm':
- jid = app.get_jid_without_resource(jid)
-
- if not jid in self.sessions:
- self.sessions[jid] = {}
-
- self.sessions[jid][sess.thread_id] = sess
-
- return sess
-
-class ConnectionHandlers(ConnectionHandlersBase):
- def __init__(self):
- ConnectionHandlersBase.__init__(self)
-
- app.nec.register_incoming_event(PresenceReceivedEvent)
- app.nec.register_incoming_event(NotificationEvent)
diff --git a/gajim/common/zeroconf/connection_handlers_zeroconf.py b/gajim/common/zeroconf/connection_handlers_zeroconf.py
index 79073055f0517823893cd54cf34bca1146007e09..c38f46458ac5a3a5497342365cd20a54f5e22f35 100644
--- a/gajim/common/zeroconf/connection_handlers_zeroconf.py
+++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py
@@ -24,7 +24,6 @@
from gajim.common import app
-from gajim.common import connection_handlers
from gajim.common.helpers import AdditionalDataDict
from gajim.common.nec import NetworkEvent
from gajim.common.modules.util import get_eme_message
@@ -36,10 +35,7 @@
log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf')
-class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase):
- def __init__(self):
- connection_handlers.ConnectionHandlersBase.__init__(self)
-
+class ConnectionHandlersZeroconf:
def _messageCB(self, con, stanza, properties):
"""
Called when we receive a message
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index dcad777d72da23f15734d9cc8dfc0d3d2e4f49b1..74acbd3b5f440f5368d20fbebc0231caed7e440e 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -63,8 +63,6 @@
from gajim.groupchat_control import GroupchatControl
from gajim.privatechat_control import PrivateChatControl
-from gajim.session import ChatControlSession
-
from gajim.common import idle
from gajim.common.zeroconf import connection_zeroconf
from gajim.common import proxy65_manager
@@ -1906,7 +1904,6 @@ def __init__(self):
self.handle_event_file_progress,
self.handle_event_file_error)
app.proxy65_manager = proxy65_manager.Proxy65Manager(app.idlequeue)
- app.default_session_type = ChatControlSession
# Creating Network Events Controller
from gajim.common import nec
diff --git a/gajim/session.py b/gajim/session.py
deleted file mode 100644
index 24c82871836de7a6774c4bb8d2403ad3309d691f..0000000000000000000000000000000000000000
--- a/gajim/session.py
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright (C) 2008-2014 Yann Leboulanger <asterix AT lagaule.org>
-# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com>
-# Jonathan Schleifer <js-gajim AT webkeks.org>
-# Stephan Erb <steve-e AT h3c.de>
-#
-# This file is part of Gajim.
-#
-# Gajim is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; version 3 only.
-#
-# Gajim is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-
-import string
-import random
-import itertools
-
-from gajim.common import helpers
-from gajim.common import events
-from gajim.common import app
-from gajim.common import contacts
-from gajim.common import ged
-from gajim.common.helpers import AdditionalDataDict
-from gajim.common.const import KindConstant
-from gajim.gui.util import get_show_in_roster
-from gajim.gui.util import get_show_in_systray
-
-
-class ChatControlSession:
- def __init__(self, conn, jid, thread_id, type_='chat'):
- self.conn = conn
- self.jid = jid
- self.type_ = type_
- self.resource = jid.resource
- self.control = None
-
- if thread_id:
- self.received_thread_id = True
- self.thread_id = thread_id
- else:
- self.received_thread_id = False
- if type_ == 'normal':
- self.thread_id = None
- else:
- self.thread_id = self.generate_thread_id()
-
- self.loggable = True
-
- self.last_send = 0
- self.last_receive = 0
-
- app.ged.register_event_handler('decrypted-message-received',
- ged.PREGUI,
- self._nec_decrypted_message_received)
-
- def generate_thread_id(self):
- return ''.join(
- [f(string.ascii_letters) for f in itertools.repeat(
- random.choice, 32)]
- )
-
- def is_loggable(self):
- return helpers.should_log(self.conn.name, self.jid.bare)
-
- def get_to(self):
- bare_jid = self.jid.bare
- if not self.resource:
- return bare_jid
- return bare_jid + '/' + self.resource
-
- def _nec_decrypted_message_received(self, obj):
- """
- Dispatch a received <message> stanza
- """
- if obj.session != self:
- return
-
- if obj.properties.is_muc_pm:
- contact = app.contacts.get_gc_contact(
- self.conn.name, obj.jid, obj.resource)
- else:
- contact = app.contacts.get_contact(
- self.conn.name, obj.jid, obj.resource)
- if self.resource != obj.resource:
- self.resource = obj.resource
- if self.control:
- if isinstance(contact, contacts.GC_Contact):
- self.control.gc_contact = contact
- self.control.contact = contact.as_contact()
- else:
- self.control.contact = contact
- if self.control.resource:
- self.control.change_resource(self.resource)
-
- if not obj.msgtxt:
- return
-
- log_type = KindConstant.CHAT_MSG_RECV
- if obj.properties.is_sent_carbon:
- log_type = KindConstant.CHAT_MSG_SENT
-
- if self.is_loggable() and obj.msgtxt:
- jid = obj.fjid
- if not obj.properties.is_muc_pm:
- jid = obj.jid
-
- obj.msg_log_id = app.storage.archive.insert_into_logs(
- self.conn.name,
- jid,
- obj.properties.timestamp,
- log_type,
- message=obj.msgtxt,
- subject=obj.properties.subject,
- additional_data=obj.additional_data,
- stanza_id=obj.unique_id,
- message_id=obj.properties.id)
-
- if obj.properties.is_muc_pm and not obj.gc_control:
- # This is a carbon of a PM from a MUC we are not currently
- # joined. We log it silently without notification.
- return True
-
- if not obj.msgtxt: # empty message text
- return True
-
- if not self.control:
- ctrl = app.interface.msg_win_mgr.search_control(obj.jid,
- obj.conn.name, obj.resource)
- if ctrl:
- self.control = ctrl
- self.control.set_session(self)
- if isinstance(contact, contacts.GC_Contact):
- self.control.gc_contact = contact
- self.control.contact = contact.as_contact()
- else:
- self.control.contact = contact
-
- if not obj.properties.is_muc_pm:
- self.roster_message2(obj)
-
- def roster_message2(self, obj):
- """
- Display the message or show notification in the roster
- """
- contact = None
- jid = obj.jid
- resource = obj.resource
-
- fjid = jid
-
- # Try to catch the contact with correct resource
- if resource:
- fjid = jid + '/' + resource
- contact = app.contacts.get_contact(obj.conn.name, jid, resource)
-
- highest_contact = app.contacts.get_contact_with_highest_priority(
- obj.conn.name, jid)
- if not contact:
- # If there is another resource, it may be a message from an
- # invisible resource
- lcontact = app.contacts.get_contacts(obj.conn.name, jid)
- if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \
- lcontact[0].show != 'offline')) and jid.find('@') > 0:
- contact = app.contacts.copy_contact(highest_contact)
- contact.resource = resource
- contact.priority = 0
- contact.show = 'offline'
- contact.status = ''
- app.contacts.add_contact(obj.conn.name, contact)
-
- else:
- # Default to highest prio
- fjid = jid
- contact = highest_contact
-
- if not contact:
- # contact is not in roster
- contact = app.interface.roster.add_to_not_in_the_roster(
- obj.conn.name, jid, obj.properties.nickname)
-
- if not self.control:
- ctrl = app.interface.msg_win_mgr.search_control(obj.jid,
- obj.conn.name, obj.resource)
- if ctrl:
- self.control = ctrl
- self.control.set_session(self)
- else:
- fjid = jid
-
- obj.popup = helpers.allow_popup_window(self.conn.name)
-
- event_t = events.ChatEvent
- event_type = 'message_received'
-
- if self.control:
- # We have a ChatControl open
- obj.show_in_roster = False
- obj.show_in_systray = False
- do_event = False
- elif obj.properties.is_sent_carbon:
- # Its a Carbon Copied Message we sent
- obj.show_in_roster = False
- obj.show_in_systray = False
- unread_events = app.events.get_events(
- self.conn.name, fjid, types=['chat'])
- read_ids = []
- for msg in unread_events:
- read_ids.append(msg.msg_log_id)
- app.storage.archive.set_read_messages(read_ids)
- app.events.remove_events(self.conn.name, fjid, types=['chat'])
- do_event = False
- else:
- # Everything else
- obj.show_in_roster = get_show_in_roster(event_type, self)
- obj.show_in_systray = get_show_in_systray(event_type,
- obj.conn.name,
- contact.jid)
- do_event = True
- if do_event:
- kind = obj.properties.type.value
- event = event_t(
- obj.msgtxt,
- obj.properties.subject,
- kind,
- obj.properties.timestamp,
- obj.resource,
- obj.msg_log_id,
- correct_id=obj.correct_id,
- message_id=obj.properties.id,
- session=self,
- displaymarking=obj.displaymarking,
- sent_forwarded=obj.properties.is_sent_carbon,
- show_in_roster=obj.show_in_roster,
- show_in_systray=obj.show_in_systray,
- additional_data=obj.additional_data)
-
- app.events.add_event(self.conn.name, fjid, event)
-
- def roster_message(self, jid, msg, tim, msg_type='',
- subject=None, resource='', msg_log_id=None, user_nick='',
- displaymarking=None, additional_data=None):
- """
- Display the message or show notification in the roster
- """
- contact = None
- fjid = jid
-
- if additional_data is None:
- additional_data = AdditionalDataDict()
-
- # Try to catch the contact with correct resource
- if resource:
- fjid = jid + '/' + resource
- contact = app.contacts.get_contact(self.conn.name, jid, resource)
-
- highest_contact = app.contacts.get_contact_with_highest_priority(
- self.conn.name, jid)
- if not contact:
- # If there is another resource, it may be a message from an invisible
- # resource
- lcontact = app.contacts.get_contacts(self.conn.name, jid)
- if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \
- lcontact[0].show != 'offline')) and jid.find('@') > 0:
- contact = app.contacts.copy_contact(highest_contact)
- contact.resource = resource
- if resource:
- fjid = jid + '/' + resource
- contact.priority = 0
- contact.show = 'offline'
- contact.status = ''
- app.contacts.add_contact(self.conn.name, contact)
-
- else:
- # Default to highest prio
- fjid = jid
- contact = highest_contact
-
- if not contact:
- # contact is not in roster
- contact = app.interface.roster.add_to_not_in_the_roster(
- self.conn.name, jid, user_nick)
-
- if not self.control:
- ctrl = app.interface.msg_win_mgr.get_control(fjid, self.conn.name)
- if ctrl:
- self.control = ctrl
- self.control.set_session(self)
- else:
- fjid = jid
-
- # Do we have a queue?
- no_queue = len(app.events.get_events(self.conn.name, fjid)) == 0
-
- popup = helpers.allow_popup_window(self.conn.name)
-
- # We print if window is opened and it's not a single message
- if self.control:
- typ = ''
-
- if msg_type == 'error':
- typ = 'error'
-
- self.control.add_message(msg,
- typ,
- tim=tim,
- subject=subject,
- displaymarking=displaymarking,
- additional_data=additional_data)
-
- if msg_log_id:
- app.storage.archive.set_read_messages([msg_log_id])
-
- return
-
- # We save it in a queue
- event_t = events.ChatEvent
- event_type = 'message_received'
-
- show_in_roster = get_show_in_roster(event_type, self)
- show_in_systray = get_show_in_systray(event_type,
- self.conn.name,
- contact.jid)
-
- event = event_t(msg, subject, msg_type, tim, resource,
- msg_log_id, session=self,
- displaymarking=displaymarking, sent_forwarded=False,
- show_in_roster=show_in_roster, show_in_systray=show_in_systray,
- additional_data=additional_data)
-
- app.events.add_event(self.conn.name, fjid, event)
-
- if popup:
- if not self.control:
- self.control = app.interface.new_chat(contact,
- self.conn.name, session=self)
-
- if app.events.get_events(self.conn.name, fjid):
- self.control.read_queue()
- else:
- if no_queue: # We didn't have a queue: we change icons
- app.interface.roster.draw_contact(jid, self.conn.name)
-
- app.interface.roster.show_title() # we show the * or [n]
- # Select the big brother contact in roster, it's visible because it has
- # events.
- family = app.contacts.get_metacontacts_family(self.conn.name, jid)
- if family:
- _nearby_family, bb_jid, bb_account = \
- app.contacts.get_nearby_family_and_big_brother(family,
- self.conn.name)
- else:
- bb_jid, bb_account = jid, self.conn.name
- app.interface.roster.select_contact(bb_jid, bb_account)