This commit is contained in:
Philipp Hörist 2018-07-28 13:32:37 +02:00
parent b913d2745b
commit 7584037fc7
6 changed files with 15 additions and 15 deletions

View File

@ -123,8 +123,8 @@ class CommonConnection:
self.awaiting_cids = {} # Used for XEP-0231 self.awaiting_cids = {} # Used for XEP-0231
# Tracks the calls of the connect_maschine() method # Tracks the calls of the connect_machine() method
self._connect_maschine_calls = 0 self._connect_machine_calls = 0
self.get_config_values_or_default() self.get_config_values_or_default()
@ -1453,7 +1453,7 @@ class Connection(CommonConnection, ConnectionHandlers):
# If we are not resuming, we ask for discovery info # If we are not resuming, we ask for discovery info
# and archiving preferences # and archiving preferences
if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled):
# This starts the connect_maschine # This starts the connect_machine
self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_server_info()
self.get_module('Discovery').discover_account_info() self.get_module('Discovery').discover_account_info()
@ -1470,15 +1470,15 @@ class Connection(CommonConnection, ConnectionHandlers):
self._stun_servers = self._hosts = [i for i in result_array] self._stun_servers = self._hosts = [i for i in result_array]
@helpers.call_counter @helpers.call_counter
def connect_maschine(self, restart=False): def connect_machine(self, restart=False):
log.info('Connect maschine state: %s', self._connect_maschine_calls) log.info('Connect machine state: %s', self._connect_machine_calls)
if self._connect_maschine_calls == 1: if self._connect_machine_calls == 1:
self.get_module('MetaContacts').get_metacontacts() self.get_module('MetaContacts').get_metacontacts()
elif self._connect_maschine_calls == 2: elif self._connect_machine_calls == 2:
self.get_module('Delimiter').get_roster_delimiter() self.get_module('Delimiter').get_roster_delimiter()
elif self._connect_maschine_calls == 3: elif self._connect_machine_calls == 3:
self.get_module('Roster').request_roster() self.get_module('Roster').request_roster()
elif self._connect_maschine_calls == 4: elif self._connect_machine_calls == 4:
self.send_first_presence() self.send_first_presence()
def send_custom_status(self, show, msg, jid): def send_custom_status(self, show, msg, jid):

View File

@ -1512,7 +1512,7 @@ def get_emoticon_theme_path(theme):
def call_counter(func): def call_counter(func):
def helper(self, restart=False): def helper(self, restart=False):
if restart: if restart:
self._connect_maschine_calls = 0 self._connect_machine_calls = 0
self._connect_maschine_calls += 1 self._connect_machine_calls += 1
return func(self, restart=False) return func(self, restart=False)
return helper return helper

View File

@ -51,7 +51,7 @@ class Delimiter:
else: else:
self.set_roster_delimiter() self.set_roster_delimiter()
self._con.connect_maschine() self._con.connect_machine()
def set_roster_delimiter(self): def set_roster_delimiter(self):
log.info('Set delimiter') log.info('Set delimiter')

View File

@ -199,7 +199,7 @@ class Discovery:
if nbxmpp.NS_ADDRESS in features: if nbxmpp.NS_ADDRESS in features:
self._con.addressing_supported = True self._con.addressing_supported = True
self._con.connect_maschine() self._con.connect_machine()
def _parse_transports(self, from_, identities, features, data, node): def _parse_transports(self, from_, identities, features, data, node):
for identity in identities: for identity in identities:

View File

@ -53,7 +53,7 @@ class MetaContacts:
app.nec.push_incoming_event(NetworkEvent( app.nec.push_incoming_event(NetworkEvent(
'metacontacts-received', conn=self._con, meta_list=meta_list)) 'metacontacts-received', conn=self._con, meta_list=meta_list))
self._con.connect_maschine() self._con.connect_machine()
@staticmethod @staticmethod
def _parse_metacontacts(stanza): def _parse_metacontacts(stanza):

View File

@ -104,7 +104,7 @@ class Roster:
roster=self._data.copy(), roster=self._data.copy(),
received_from_server=received_from_server)) received_from_server=received_from_server))
self._con.connect_maschine() self._con.connect_machine()
def _roster_push_received(self, con, stanza): def _roster_push_received(self, con, stanza):
log.info('Push received') log.info('Push received')