Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Update servers.json
by Philipp Hörist 21 Mar '20

21 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8ef33d0 by lovetox at 2020-03-21T21:17:20+01:00 Update servers.json Fix syntax error - - - - - 1 changed file: - gajim/data/other/servers.json Changes: ===================================== gajim/data/other/servers.json ===================================== @@ -29,6 +29,6 @@ "ubuntu-jabber.net", "verdammung.org", "xabber.de", - "xmpp-hosting.de", + "xmpp-hosting.de" ] } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8ef33d0178140048663c90deec4a5e9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8ef33d0178140048663c90deec4a5e9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Dataform: Fix hiding fallback fields
by Philipp Hörist 21 Mar '20

21 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1477078c by lovetox at 2020-03-21T20:01:42+01:00 Dataform: Fix hiding fallback fields - - - - - 4ce3f3a1 by lovetox at 2020-03-21T20:02:45+01:00 Update servers.json Remove servers which - Redirect to a website - Are not reachable - Have invalid certificates - - - - - 2 changed files: - gajim/data/other/servers.json - gajim/gtk/dataform.py Changes: ===================================== gajim/data/other/servers.json ===================================== @@ -1,24 +1,18 @@ { "servers":[ "0nl1ne.at", - "404.city", "blabber.im", - "brauchen.info", - "chatme.im", - "comm.unicate.me", "creep.im", "deshalbfrei.org", "draugr.de", "im.apinc.org", "jabber-hosting.de", - "jabber.at", "jabber.ccc.de", "jabber.cz", "jabber.hot-chilli.net", "jabber.meta.net.nz", "jabber.no", "jabber.sk", - "jabber.rueckgr.at", "jabberes.org", "jabbim.com", "jabbim.cz", @@ -28,7 +22,6 @@ "lightwitch.org", "linuxlovers.at", "njs.netlab.cz", - "pandion.im", "richim.org", "suchat.org", "tigase.im", @@ -37,7 +30,5 @@ "verdammung.org", "xabber.de", "xmpp-hosting.de", - "xmpp.jp", - "zsim.de" ] } ===================================== gajim/gtk/dataform.py ===================================== @@ -146,7 +146,7 @@ class FormGrid(Gtk.Grid): continue if options.get('hide-fallback-fields'): - if 'fallback' in field.var: + if field.var is not None and 'fallback' in field.var: continue if field.media: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a45bc79195fdbc904702642360b00f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a45bc79195fdbc904702642360b00f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Dataform: Validate field on creation
by Philipp Hörist 21 Mar '20

21 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4000b52c by lovetox at 2020-03-21T19:40:17+01:00 Dataform: Validate field on creation Dataforms can provide default values for fields - - - - - d94c45e2 by lovetox at 2020-03-21T19:40:17+01:00 Dataform: Make dataform node public - - - - - a45bc791 by lovetox at 2020-03-21T19:40:17+01:00 AccountWizard: Make IBR work again - - - - - 3 changed files: - gajim/data/gui/account_wizard.ui - gajim/gtk/account_wizard.py - gajim/gtk/dataform.py Changes: ===================================== gajim/data/gui/account_wizard.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkGrid" id="advanced_grid"> @@ -313,7 +313,6 @@ <object class="GtkButton" id="sign_up_button"> <property name="label" translatable="yes">_Sign Up</property> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Sign up for a new account on a server of your choice</property> @@ -332,6 +331,58 @@ <property name="popup_completion">False</property> <property name="popup_single_match">False</property> </object> + <object class="GtkBox" id="redirect_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="icon_name">applications-internet-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="instructions"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">42</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="link_button"> + <property name="label" translatable="yes">Visit Website</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="use_underline">True</property> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> <object class="GtkBox" id="security_warning_box"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -650,6 +701,7 @@ Creating an account on one server allows you to communicate with contacts from o <object class="GtkCheckButton" id="sign_up_anonymously"> <property name="label" translatable="yes">Sign up Anonymously</property> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Note: Anonymous accounts are not possible on all servers</property> ===================================== gajim/gtk/account_wizard.py ===================================== @@ -26,6 +26,7 @@ from nbxmpp.const import Mode from nbxmpp.const import StreamError from nbxmpp.const import ConnectionProtocol from nbxmpp.const import ConnectionType +from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import configpaths @@ -48,7 +49,7 @@ log = logging.getLogger('gajim.gtk.account_wizard') class AccountWizard(Assistant): def __init__(self): - Assistant.__init__(self) + Assistant.__init__(self, height=500) self._destroyed = False @@ -61,9 +62,10 @@ class AccountWizard(Assistant): self.add_pages({'login': Login(self._on_button_clicked), 'signup': Signup(), - 'form': Form(), 'advanced': AdvancedSettings(), 'security-warning': SecurityWarning(), + 'form': Form(), + 'redirect': Redirect(), 'success': Success(), }) @@ -94,7 +96,7 @@ class AccountWizard(Assistant): if page_name in ('login', 'progress'): return None - if page_name == 'error': + if page_name in ('error', 'redirect'): return ['back'] if page_name == 'success': @@ -159,17 +161,26 @@ class AccountWizard(Assistant): self.show_page('login', Gtk.StackTransitionType.SLIDE_RIGHT) elif page in ('advanced', 'error', 'security-warning'): - self.show_page(self._method, - Gtk.StackTransitionType.SLIDE_RIGHT) + if (page == 'error' and + self._method == 'signup' and + self.get_page('form').has_form): + self.show_page('form', Gtk.StackTransitionType.SLIDE_RIGHT) + else: + self.show_page(self._method, + Gtk.StackTransitionType.SLIDE_RIGHT) elif page == 'form': - # TODO: Disconnect - self.get_page('form').remove_form() self.show_page('signup', Gtk.StackTransitionType.SLIDE_RIGHT) + self.get_page('form').remove_form() + self._disconnect() + + elif page == 'redirect': + self.show_page('login', Gtk.StackTransitionType.SLIDE_RIGHT) def _on_page_changed(self, _assistant, page_name): if page_name == 'signup': self._method = page_name + self.get_page('signup').focus() self.set_default_button('signup') elif page_name == 'login': @@ -185,15 +196,15 @@ class AccountWizard(Assistant): elif page_name == 'success': self.set_default_button('connect') - elif page_name == 'error': + elif page_name in ('error', 'redirect'): self.set_default_button('back') + elif page_name == 'form': + self.set_default_button('signup') + def update_proxy_list(self): self.get_page('advanced').update_proxy_list() - def _on_destroy(self, *args): - self._destroyed = True - def _get_base_client(self, domain, username, @@ -201,10 +212,10 @@ class AccountWizard(Assistant): advanced, ignore_all_errors): - client = Client() + client = Client(log_context='Account Wizard') client.set_domain(domain) client.set_username(username) - client.set_mode(Mode.LOGIN_TEST) + client.set_mode(mode) client.set_ignore_tls_errors(ignore_all_errors) client.set_accepted_certificates( app.cert_store.get_certificates()) @@ -223,10 +234,17 @@ class AccountWizard(Assistant): client.subscribe('connection-failed', self._on_connection_failed) return client + def _disconnect(self): + if self._client is None: + return + self._client.remove_subscriptions() + self._client.disconnect() + self._client = None + def _test_credentials(self, ignore_all_errors=False): self._show_progress_page(_('Connecting...'), _('Connecting to server...')) - address, password = self.get_page('login').get_data() + address, password = self.get_page('login').get_credentials() jid = JID(address) advanced = self.get_page('login').is_advanced() @@ -291,6 +309,10 @@ class AccountWizard(Assistant): _('Signup not allowed'), _('This server does not allow signup.')) + elif domain == StreamError.STREAM: + self._show_error_page(_('Error'), _('Error'), error) + + self.get_page('form').remove_form() self._client.destroy() self._client = None @@ -322,27 +344,84 @@ class AccountWizard(Assistant): return domain def _on_register_form(self, result): - if result.form is None: - # Invalid form + if is_error_result(result): + self._show_error_page(_('Error'), + _('Error'), + result.get_text()) + self._disconnect() return if result.bob_data is not None: algo_hash = result.bob_data.cid.split('@')[0] app.bob_cache[algo_hash] = result.bob_data.data - self.get_page('form').add_form(result.form) + + form = result.form + if result.form is None: + form = result.fields_form + + if form is not None: + self.get_page('form').add_form(form) + + elif result.oob_url is not None: + self.get_page('redirect').set_redirect(result.oob_url, + result.instructions) + self.show_page('redirect', Gtk.StackTransitionType.SLIDE_LEFT) + self._disconnect() + return + self.show_page('form', Gtk.StackTransitionType.SLIDE_LEFT) def _submit_form(self): - pass - # if self.is_form: - # form = self.get_page('form').get_data_form() - # else: - # form = self.get_page('form').get_submit_form() - # app.connections[self.account].send_new_account_infos( - # form, self.is_form) - # self.get_page('progress').set_text(_('Account is being created')) - # self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) - # self.get_page('form').remove_form() + self.get_page('progress').set_text(_('Account is being created')) + self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) + + form = self.get_page('form').get_submit_form() + self._client.get_module('Register').submit_register_form( + form, callback=self._on_register_result) + + def _on_register_result(self, result): + if is_error_result(result): + self._on_register_error(result) + return + + username, password = self.get_page('form').get_credentials() + account = self._generate_account_name(self._client.domain) + app.interface.create_account(account, + username, + self._client.domain, + password) + + self.get_page('success').set_account(account) + self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) + self.get_page('form').remove_form() + self._disconnect() + + def _on_register_error(self, result): + self._show_error_page(_('Error'), + _('Error'), + result.get_text()) + + register_data = result.get_date() + if register_data is None: + # IQ error did not have the payload included + self.get_page('form').remove_form() + self._disconnect() + return + + form = register_data.form + if register_data.form is None: + form = register_data.fields_form + + if form is not None: + self.get_page('form').add_form(form) + + else: + self.get_page('form').remove_form() + self._disconnect() + + def _on_destroy(self, *args): + self._disconnect() + self._destroyed = True class Login(Page): @@ -445,7 +524,7 @@ class Login(Page): def is_advanced(self): return self._ui.login_advanced_checkbutton.get_active() - def get_data(self): + def get_credentials(self): data = (self._ui.log_in_address_entry.get_text(), self._ui.log_in_password_entry.get_text()) return data @@ -479,6 +558,9 @@ class Signup(Page): self.show_all() + def focus(self): + self._ui.server_comboboxtext_sign_up_entry.grab_focus() + def _create_server_completion(self): # Parse servers.json server_file_path = os.path.join( @@ -663,6 +745,10 @@ class Form(Page): self.show_all() + @property + def has_form(self): + return self._current_form is not None + def _on_is_valid(self, _widget, is_valid): self.complete = is_valid self.get_toplevel().update_page_complete() @@ -670,20 +756,49 @@ class Form(Page): def add_form(self, form): self.remove_form() - options = {'hide-fallback-fields': True} + options = {'hide-fallback-fields': True, + 'entry-activates-default': True} self._current_form = DataFormWidget(form, options) self._current_form.connect('is-valid', self._on_is_valid) self._current_form.validate() self.pack_start(self._current_form, True, True, 0) self._current_form.show_all() + def get_credentials(self): + return (self._current_form.get_form()['username'].value, + self._current_form.get_form()['password'].value) + def get_submit_form(self): return self._current_form.get_submit_form() def remove_form(self): - if self._current_form is not None: - self.remove(self._current_form) - self._current_form.destroy() + if self._current_form is None: + return + + self.remove(self._current_form) + self._current_form.destroy() + self._current_form = None + + +class Redirect(Page): + def __init__(self): + Page.__init__(self) + self.title = _('Redirect') + self._link = None + + self._ui = get_builder('account_wizard.ui') + self.pack_start(self._ui.redirect_box, True, True, 0) + self._ui.link_button.connect('clicked', self._on_link_button) + self.show_all() + + def set_redirect(self, link, instructions): + if instructions is None: + instructions = _('Register on the Website') + self._ui.instructions.set_text(instructions) + self._link = link + + def _on_link_button(self, _button): + open_uri(self._link) class Success(Page): ===================================== gajim/gtk/dataform.py ===================================== @@ -62,6 +62,9 @@ class DataFormWidget(Gtk.ScrolledWindow): def validate(self): return self._form_grid.validate(True) + def get_form(self): + return self._form_node + def get_submit_form(self): self._form_node.type_ = 'submit' return self._form_node @@ -257,7 +260,9 @@ class Field: form_grid.attach_next_to(self._warning_box, self._widget, Gtk.PositionType.RIGHT, 1, 1) - self._set_warning(False, '') + + is_valid, error = self._field.is_valid() + self._set_warning(is_valid, error) def _set_warning(self, is_valid, error): if not self._field.required and not is_valid and not error: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/63b32126a6bfea217fbb896663f7032… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/63b32126a6bfea217fbb896663f7032… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Register: Add method submit_register_form()
by Philipp Hörist 21 Mar '20

21 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5c6e1bd8 by lovetox at 2020-03-21T19:29:32+01:00 Register: Add method submit_register_form() - - - - - 1 changed file: - nbxmpp/modules/register.py Changes: ===================================== nbxmpp/modules/register.py ===================================== @@ -21,6 +21,7 @@ from nbxmpp.protocol import NS_REGISTER from nbxmpp.protocol import Iq from nbxmpp.protocol import isResultNode from nbxmpp.structs import CommonResult +from nbxmpp.structs import CommonError from nbxmpp.structs import RegisterData from nbxmpp.structs import ChangePasswordResult from nbxmpp.util import call_on_response @@ -63,12 +64,43 @@ class Register(BaseModule): instructions = query.getTagData('instructions') or None - return RegisterData(instructions=instructions, + data = RegisterData(instructions=instructions, form=self._parse_form(stanza), fields_form=self._parse_fields_form(query), oob_url=self._parse_oob_url(query), bob_data=parse_bob_data(query)) + if (data.form is None and + data.fields_form is None and + data.oob_url is None): + return raise_error(self._log.info, stanza, 'stanza-malformed') + return data + + @call_on_response('_on_submit_result') + def submit_register_form(self, form): + iq = Iq('set', NS_REGISTER, to=self._client.domain) + iq.setQueryPayload(form) + return iq + + @callback + def _on_submit_result(self, stanza): + if isResultNode(stanza): + return CommonResult(jid=stanza.getFrom()) + + query = stanza.getTag('query', namespace=NS_REGISTER) + if query is None: + return RegisterError(stanza, None) + + instructions = query.getTagData('instructions') or None + + data = RegisterData(instructions=instructions, + form=self._parse_form(stanza), + fields_form=self._parse_fields_form(query), + oob_url=self._parse_oob_url(query), + bob_data=parse_bob_data(query)) + + return RegisterError(stanza, data) + @callback def _default_response(self, stanza): if not isResultNode(stanza): @@ -83,7 +115,8 @@ class Register(BaseModule): return None def _parse_form(self, stanza): - form = stanza.getQuery().getTag('x', namespace=NS_DATA) + query = stanza.getTag('query', namespace=NS_REGISTER) + form = query.getTag('x', namespace=NS_DATA) if form is None: return None @@ -150,3 +183,12 @@ class Register(BaseModule): iq = Iq('set', NS_REGISTER, to=domain) iq.setQueryPayload(form) return iq + + +class RegisterError(CommonError): + def __init__(self, stanza, data): + CommonError.__init__(self, stanza) + self._data = data + + def get_data(self): + return self._data View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5c6e1bd8a790f4cf4434bf6b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5c6e1bd8a790f4cf4434bf6b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Add dependency for audio/video chat
by André 21 Mar '20

21 Mar '20

André pushed to branch master at gajim / gajim Commits: 63b32126 by André Apitzsch at 2020-03-21T13:08:32+01:00 Flatpak: Add dependency for audio/video chat - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -27,6 +27,8 @@ finish-args: - --talk-name=org.freedesktop.secrets # GnuPG - --filesystem=~/.gnupg + # camera access + - --device=all # extensions - --env=PYTHONPATH=/app/plugins/lib/python3.7/site-packages @@ -191,6 +193,12 @@ modules: url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.3.tar.xz sha256: 5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8 + - name: farstream + sources: + - type: archive + url: https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2… + sha256: cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b + - name: python3-nbxmpp buildsystem: simple build-commands: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63b32126a6bfea217fbb896663f70327… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63b32126a6bfea217fbb896663f70327… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor A/V dependency test
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a005912 by lovetox at 2020-03-20T23:23:39+01:00 Refactor A/V dependency test - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -265,12 +265,13 @@ def detect_dependencies(): pass try: - Gst.init(None) - conference = Gst.ElementFactory.make('fsrtpconference', None) - conference.new_session(Farstream.MediaType.AUDIO) - _dependencies['AV'] = True + if _dependencies['GST'] and _dependencies['FARSTREAM']: + Gst.init(None) + conference = Gst.ElementFactory.make('fsrtpconference', None) + conference.new_session(Farstream.MediaType.AUDIO) + _dependencies['AV'] = True except Exception as error: - log('gajim').info(error) + log('gajim').warning('AV dependency test failed: %s', error) # GEOCLUE try: @@ -316,7 +317,7 @@ def detect_dependencies(): gsound_ctx.init() _dependencies['GSOUND'] = True except GLib.Error as error: - log('gajim').error(error) + log('gajim').warning('GSound init failed: %s', error) except (ImportError, ValueError): pass View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a005912ec60ca9d6d67cd415c49e79c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a005912ec60ca9d6d67cd415c49e79c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3c50f33c by lovetox at 2020-03-20T22:09:06+01:00 Fix pylint errors - - - - - 6deff74b by lovetox at 2020-03-20T22:15:06+01:00 Remove log_calls() decorator This generates too much debug output - - - - - 4 changed files: - gajim/common/client.py - gajim/common/helpers.py - gajim/plugins/gajimplugin.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/client.py ===================================== @@ -52,7 +52,8 @@ class Client(ConnectionHandlers): self._client = None self._account = account self.name = account - self._hostname = app.config.get_per('accounts', self._account, 'hostname') + self._hostname = app.config.get_per( + 'accounts', self._account, 'hostname') self._user = app.config.get_per('accounts', self._account, 'name') self.password = None @@ -135,7 +136,8 @@ class Client(ConnectionHandlers): self._client.set_ignored_tls_errors(self._get_ignored_ssl_errors()) - if app.config.get_per('accounts', self._account, 'use_plain_connection'): + if app.config.get_per('accounts', self._account, + 'use_plain_connection'): self._client.set_connection_types([ConnectionType.PLAIN]) proxy = get_user_proxy(self._account) @@ -270,12 +272,12 @@ class Client(ConnectionHandlers): self.get_module('Chatstate').enabled = True self.get_module('MAM').reset_state() - def _on_stanza_sent(self, _client, signal_name, stanza): + def _on_stanza_sent(self, _client, _signal_name, stanza): app.nec.push_incoming_event(NetworkEvent('stanza-sent', account=self._account, stanza=stanza)) - def _on_stanza_received(self, _client, signal_name, stanza): + def _on_stanza_received(self, _client, _signal_name, stanza): app.nec.push_incoming_event(NetworkEvent('stanza-received', account=self._account, stanza=stanza)) @@ -365,7 +367,7 @@ class Client(ConnectionHandlers): return modules.get(self._account, name) @helpers.call_counter - def connect_machine(self, restart=False): + def connect_machine(self): log.info('Connect machine state: %s', self._connect_machine_calls) if self._connect_machine_calls == 1: self.get_module('MetaContacts').get_metacontacts() @@ -506,8 +508,8 @@ class Client(ConnectionHandlers): def _abort_reconnect(self): self._set_state(ClientState.DISCONNECTED) self._disable_reconnect_timer() - app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show='offline')) + app.nec.push_incoming_event( + OurShowEvent(None, conn=self, show='offline')) if self._destroy_client: self._client.destroy() ===================================== gajim/common/helpers.py ===================================== @@ -1289,7 +1289,7 @@ def call_counter(func): if restart: self._connect_machine_calls = 0 self._connect_machine_calls += 1 - return func(self, restart=False) + return func(self) return helper def get_sync_threshold(jid, archive_info): ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -36,7 +36,7 @@ from gajim.common.types import PluginExtensionPoints # pylint: disable=W0611 from gajim.common.types import EventHandlersDict # pylint: disable=W0611 from gajim.common.types import PluginEvents # pylint: disable=W0611 -from gajim.plugins.helpers import log_calls, log +from gajim.plugins.helpers import log from gajim.plugins.gui import GajimPluginConfigDialog @@ -161,7 +161,6 @@ class GajimPlugin: subclasses. ''' - @log_calls('GajimPlugin') def __init__(self) -> None: self.config = GajimPluginConfig(self) ''' @@ -177,11 +176,9 @@ class GajimPlugin: self.config_dialog = GajimPluginConfigDialog(self) self.init() - @log_calls('GajimPlugin') def save_config(self) -> None: self.config.save() - @log_calls('GajimPlugin') def load_config(self) -> None: self.config.load() @@ -197,32 +194,26 @@ class GajimPlugin: return False - @log_calls('GajimPlugin') def local_file_path(self, file_name): return os.path.join(self.__path__, file_name) - @log_calls('GajimPlugin') def init(self): pass - @log_calls('GajimPlugin') def activate(self): pass - @log_calls('GajimPlugin') def deactivate(self): pass class GajimPluginConfig(): - @log_calls('GajimPluginConfig') def __init__(self, plugin): self.plugin = plugin self.FILE_PATH = os.path.join( configpaths.get('PLUGINS_CONFIG_DIR'), self.plugin.short_name) self.data = {} - @log_calls('GajimPluginConfig') def __getitem__(self, key): if not key in self.data: self.data[key] = self.plugin.config_default_values[key][0] @@ -230,17 +221,14 @@ class GajimPluginConfig(): return self.data[key] - @log_calls('GajimPluginConfig') def __setitem__(self, key, value): self.data[key] = value self.save() - @log_calls('GajimPluginConfig') def __delitem__(self, key): del self.data[key] self.save() - @log_calls('GajimPluginConfig') def __contains__(self, key): return key in self.data @@ -254,13 +242,11 @@ class GajimPluginConfig(): def items(self): return self.data.items() - @log_calls('GajimPluginConfig') def save(self): fd = open(self.FILE_PATH, 'wb') pickle.dump(self.data, fd) fd.close() - @log_calls('GajimPluginConfig') def load(self): if os.path.isfile(self.FILE_PATH): fd = open(self.FILE_PATH, 'rb') ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -42,7 +42,7 @@ from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import Singleton from gajim.plugins import plugins_i18n -from gajim.plugins.helpers import log, log_calls +from gajim.plugins.helpers import log from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.gajimplugin import GajimPlugin, GajimPluginException @@ -75,7 +75,6 @@ class PluginManager(metaclass=Singleton): 'destructors' (classes that register GUI extension points) ''' - #@log_calls('PluginManager') def __init__(self): self.plugins = [] ''' @@ -115,20 +114,17 @@ class PluginManager(metaclass=Singleton): pc = self.scan_dir_for_plugins(path) self.add_plugins(pc) - @log_calls('PluginManager') def _plugin_has_entry_in_global_config(self, plugin): if app.config.get_per('plugins', plugin.short_name) is None: return False return True - @log_calls('PluginManager') def _create_plugin_entry_in_global_config(self, plugin): app.config.add_per('plugins', plugin.short_name) def _remove_plugin_entry_in_global_config(self, plugin): app.config.del_per('plugins', plugin.short_name) - @log_calls('PluginManager') def update_plugins(self, replace=True, activate=False, plugin_name=None): ''' Move plugins from the downloaded folder to the user plugin folder @@ -171,11 +167,9 @@ class PluginManager(metaclass=Singleton): return updated_plugins - @log_calls('PluginManager') def init_plugins(self): self._activate_all_plugins_from_global_config() - @log_calls('PluginManager') def add_plugin(self, plugin_class): ''' :todo: what about adding plug-ins that are already added? Module reload @@ -201,7 +195,6 @@ class PluginManager(metaclass=Singleton): plugin.name, plugin.version, plugin.__module__, plugin.short_name) - @log_calls('PluginManager') def remove_plugin(self, plugin): ''' removes the plugin from the plugin list and deletes all loaded modules @@ -227,19 +220,16 @@ class PluginManager(metaclass=Singleton): for module_to_remove in modules_to_remove: del sys.modules[module_to_remove] - @log_calls('PluginManager') def add_plugins(self, plugin_classes): for plugin_class in plugin_classes: self.add_plugin(plugin_class) - @log_calls('PluginManager') def get_active_plugin(self, plugin_name): for plugin in self.active_plugins: if plugin.short_name == plugin_name: return plugin return None - @log_calls('PluginManager') def extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for a particular extension point, but @@ -259,7 +249,6 @@ class PluginManager(metaclass=Singleton): self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, *args) - @log_calls('PluginManager') def gui_extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for particular GUI extension point @@ -289,7 +278,6 @@ class PluginManager(metaclass=Singleton): self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, *args) - @log_calls('PluginManager') def remove_gui_extension_point(self, gui_extpoint_name, *args): ''' Removes GUI extension point from collection held by `PluginManager`. @@ -339,7 +327,6 @@ class PluginManager(metaclass=Singleton): if disconnect_handler is not None: disconnect_handler(args[0]) - @log_calls('PluginManager') def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args): ''' Adds GUI extension point call to list of calls. @@ -365,7 +352,6 @@ class PluginManager(metaclass=Singleton): self.gui_extension_points.setdefault(gui_extpoint_name, []).append( args) - @log_calls('PluginManager') def _execute_all_handlers_of_gui_extension_point(self, gui_extpoint_name, *args): if gui_extpoint_name in self.gui_extension_points_handlers: @@ -444,7 +430,6 @@ class PluginManager(metaclass=Singleton): handler = handler[:4] con.connection.unregister_handler(*handler) - @log_calls('PluginManager') def activate_plugin(self, plugin): ''' :param plugin: plugin to be activated @@ -507,7 +492,6 @@ class PluginManager(metaclass=Singleton): for plugin_object in self.active_plugins: self.deactivate_plugin(plugin_object) - @log_calls('PluginManager') def _add_gui_extension_points_handlers_from_plugin(self, plugin): for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): @@ -518,7 +502,6 @@ class PluginManager(metaclass=Singleton): if plugin.encryption_name: self.encryption_plugins[plugin.encryption_name] = plugin - @log_calls('PluginManager') def _handle_all_gui_extension_points_with_plugin(self, plugin): for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): @@ -534,7 +517,6 @@ class PluginManager(metaclass=Singleton): handler, exc_info=True) - @log_calls('PluginManager') def _activate_all_plugins(self): ''' Activates all plugins in `plugins`. @@ -580,7 +562,6 @@ class PluginManager(metaclass=Singleton): def _set_plugin_active_in_global_config(self, plugin, active=True): app.config.set_per('plugins', plugin.short_name, 'active', active) - @log_calls('PluginManager') def scan_dir_for_plugins(self, path, scan_dirs=True, package=False): r''' Scans given directory for plugin classes. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/173918c814cf17cd3712418583d5a1c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/173918c814cf17cd3712418583d5a1c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Client: Handle resource conflict
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 173918c8 by lovetox at 2020-03-20T22:01:53+01:00 Client: Handle resource conflict - - - - - 2 changed files: - gajim/common/client.py - gajim/gui_interface.py Changes: ===================================== gajim/common/client.py ===================================== @@ -204,13 +204,14 @@ class Client(ConnectionHandlers): app.nec.push_incoming_event(OurShowEvent( None, conn=self, show='offline')) self.process_ssl_errors() - return - if domain == StreamError.STREAM: - if not self._state.is_disconnecting: - self._reconnect = True + elif domain in (StreamError.STREAM, StreamError.BIND): + if error == 'conflict': + # Reset resource + app.config.set_per('accounts', self._account, + 'resource', 'gajim.$rand') - if domain == StreamError.SASL: + elif domain == StreamError.SASL: self._reconnect = False if error in ('not-authorized', 'no-password'): ===================================== gajim/gui_interface.py ===================================== @@ -897,37 +897,6 @@ class Interface: input_str=obj.alt_name, transient_for=self.roster.window).show() - def handle_event_resource_conflict(self, obj): - # ('RESOURCE_CONFLICT', account, ()) - # First we go offline, but we don't overwrite status message - account = obj.conn.name - conn = obj.conn - self.roster.send_status(account, 'offline', conn.status_message) - - def _set_resource(new_resource): - app.config.set_per('accounts', account, 'resource', new_resource) - self.roster.send_status(account, conn.status, conn.status_message) - - proposed_resource = conn.server_resource - if proposed_resource.startswith('gajim.'): - # Dont notify the user about resource change if he didn't set - # a custom resource - _set_resource('gajim.$rand') - return - - proposed_resource += app.config.get('gc_proposed_nick_char') - - InputDialog( - _('Resource Conflict'), - _('Resource Conflict'), - _('You are already connected to this account with the same ' - 'resource. Please enter a different one.'), - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Connect'), - callback=_set_resource)], - input_str=proposed_resource).show() - def handle_event_jingleft_cancel(self, obj): ft = self.instances['file_transfers'] file_props = None @@ -1081,7 +1050,6 @@ class Interface: 'roster-item-exchange-received': \ [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], - 'stream-conflict-received': [self.handle_event_resource_conflict], 'subscribe-presence-received': [ self.handle_event_subscribe_presence], 'subscribed-presence-received': [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/173918c814cf17cd3712418583d5a1cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/173918c814cf17cd3712418583d5a1cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Client: Simplify bind/session error handling
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b22e79b6 by lovetox at 2020-03-20T21:06:06+01:00 Client: Simplify bind/session error handling - - - - - c4959902 by lovetox at 2020-03-20T21:38:00+01:00 Client: Don't pass stream error as error text - - - - - 2 changed files: - nbxmpp/client.py - nbxmpp/const.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -438,7 +438,7 @@ class Client(Observable): def _on_stream_end(self, _dispatcher, _signal_name, error): if not self.has_error: - self._set_error(StreamError.STREAM, 'stream-end', error) + self._set_error(StreamError.STREAM, error or 'stream-end') self._con.shutdown_input() if not self._stream_close_initiated: @@ -638,9 +638,6 @@ class Client(Observable): elif self.state == StreamState.WAIT_FOR_BIND: self._on_bind(stanza) - elif self.state == StreamState.BIND_FAILED: - self._disconnect_with_error(StreamError.BIND, 'bind-failed') - elif self.state == StreamState.BIND_SUCCESSFUL: self._smacks.send_enable() self._dispatcher.set_dispatch_callback(None) @@ -650,9 +647,6 @@ class Client(Observable): elif self.state == StreamState.WAIT_FOR_SESSION: self._on_session(stanza) - elif self.state == StreamState.SESSION_FAILED: - self._disconnect_with_error(StreamError.SESSION, 'session-failed') - elif self.state == StreamState.WAIT_FOR_RESUMED: self._smacks.delegate(stanza) @@ -735,12 +729,9 @@ class Client(Observable): def _on_bind(self, stanza): if not isResultNode(stanza): - self._log.error('Binding failed: %s.', stanza.getTag('error')) - if stanza.getError() == 'conflict' and self.resource is not None: - self._log.info('Try to request server generated resource') - self._start_bind() - return - self.set_state(StreamState.BIND_FAILED) + self._disconnect_with_error(StreamError.BIND, + stanza.getError(), + stanza.getErrorMsg()) return jid = stanza.getTag('bind').getTagData('jid') @@ -762,7 +753,9 @@ class Client(Observable): self.set_state(StreamState.BIND_SUCCESSFUL) else: self._log.error('Session open failed') - self.set_state(StreamState.SESSION_FAILED) + self._disconnect_with_error(StreamError.SESSION, + stanza.getError(), + stanza.getErrorMsg()) def _ping(self): iq = Iq('get', to=self._jid.getBare()) ===================================== nbxmpp/const.py ===================================== @@ -357,13 +357,11 @@ class StreamState(Enum): PROCEED_WITH_AUTH = 'proceed with auth' AUTH_SUCCESSFUL = 'auth successful' AUTH_FAILED = 'auth failed' - SESSION_FAILED = 'session failed' WAIT_FOR_RESUMED = 'wait for resumed' RESUME_FAILED = 'resume failed' RESUME_SUCCESSFUL = 'resume successful' PROCEED_WITH_BIND = 'proceed with bind' BIND_SUCCESSFUL = 'bind successful' - BIND_FAILED = 'bind failed' WAIT_FOR_BIND = 'wait for bind' WAIT_FOR_SESSION = 'wait for session' ACTIVE = 'active' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/636ba000f923a0a03c8b069… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/636ba000f923a0a03c8b069… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Client: Correctly set resource for bind
by Philipp Hörist 20 Mar '20

20 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cc13f14a by lovetox at 2020-03-20T20:20:25+01:00 Client: Correctly set resource for bind Fixes #10026 - - - - - 2 changed files: - gajim/common/client.py - gajim/common/helpers.py Changes: ===================================== gajim/common/client.py ===================================== @@ -35,6 +35,7 @@ from gajim.common.helpers import get_encryption_method from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection +from gajim.common.helpers import get_resource from gajim.common.connection_handlers import ConnectionHandlers from gajim.common.connection_handlers_events import OurShowEvent @@ -116,7 +117,7 @@ class Client(ConnectionHandlers): self.connection = self._client self._client.set_domain(self._hostname) self._client.set_username(self._user) - self._client.set_resource('test') + self._client.set_resource(get_resource(self._account)) custom_host = get_custom_host(self._account) if custom_host is not None: ===================================== gajim/common/helpers.py ===================================== @@ -1565,14 +1565,15 @@ def geo_provider_from_location(lat, lon): def get_resource(account): resource = app.config.get_per('accounts', account, 'resource') - # All valid resource substitution strings should be added to this hash. - if resource: - rand = ''.join(random.choice( - string.ascii_uppercase + string.digits) for _ in range(8)) - resource = Template(resource).safe_substitute( - {'hostname': socket.gethostname(), - 'rand': rand}) - app.config.set_per('accounts', account, 'resource', resource) + if not resource: + return None + + rand = ''.join(random.choice( + string.ascii_uppercase + string.digits) for _ in range(8)) + resource = Template(resource).safe_substitute( + {'hostname': socket.gethostname(), + 'rand': rand}) + app.config.set_per('accounts', account, 'resource', resource) return resource View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc13f14a646eb07a2b9601a39562461b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc13f14a646eb07a2b9601a39562461b… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits