copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dont try to set empty privacy default list 

This will result in a conflict stanza because an active
default list cant be deleted

Decline the use of default list first, then delete the list
This commit is contained in:
Philipp Hörist 2017-01-27 23:58:28 +01:00
parent 63335357be
commit 25b933e294
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/connection.py
View File

@ -1797,7 +1797,6 @@ class Connection(CommonConnection, ConnectionHandlers):
if rule['action'] != 'deny' or rule['type'] != 'jid' \ if rule['action'] != 'deny' or rule['type'] != 'jid' \
or rule['value'] not in self.to_unblock: or rule['value'] not in self.to_unblock:
self.new_blocked_list.append(rule) self.new_blocked_list.append(rule)
self.set_privacy_list(self.privacy_default_list, self.new_blocked_list)
if len(self.new_blocked_list) == 0: if len(self.new_blocked_list) == 0:
self.blocked_list = [] self.blocked_list = []
self.blocked_contacts = [] self.blocked_contacts = []
@ -1805,6 +1804,8 @@ class Connection(CommonConnection, ConnectionHandlers):
self.set_default_list('') self.set_default_list('')
self.set_active_list('') self.set_active_list('')
self.del_privacy_list(self.privacy_default_list) self.del_privacy_list(self.privacy_default_list)
else:
self.set_privacy_list(self.privacy_default_list, self.new_blocked_list)
if not gajim.interface.roster.regroup: if not gajim.interface.roster.regroup:
show = gajim.SHOW_LIST[self.connected] show = gajim.SHOW_LIST[self.connected]
else: # accounts merged else: # accounts merged
@ -1841,7 +1842,6 @@ class Connection(CommonConnection, ConnectionHandlers):
if rule['action'] != 'deny' or rule['type'] != 'group' or \ if rule['action'] != 'deny' or rule['type'] != 'group' or \
rule['value'] != group: rule['value'] != group:
self.new_blocked_list.append(rule) self.new_blocked_list.append(rule)
self.set_privacy_list(self.privacy_default_list, self.new_blocked_list)
if len(self.new_blocked_list) == 0: if len(self.new_blocked_list) == 0:
self.blocked_list = [] self.blocked_list = []
self.blocked_contacts = [] self.blocked_contacts = []
@ -1849,6 +1849,8 @@ class Connection(CommonConnection, ConnectionHandlers):
self.set_default_list('') self.set_default_list('')
self.set_active_list('') self.set_active_list('')
self.del_privacy_list(self.privacy_default_list) self.del_privacy_list(self.privacy_default_list)
else:
self.set_privacy_list(self.privacy_default_list, self.new_blocked_list)
if not gajim.interface.roster.regroup: if not gajim.interface.roster.regroup:
show = gajim.SHOW_LIST[self.connected] show = gajim.SHOW_LIST[self.connected]
else: # accounts merged else: # accounts merged

3
src/groupchat_control.py
View File

@ -2798,7 +2798,6 @@ class GroupchatControl(ChatControlBase):
or rule['value'] != fjid: or rule['value'] != fjid:
connection.new_blocked_list.append(rule) connection.new_blocked_list.append(rule)
connection.set_privacy_list(default, connection.new_blocked_list)
if len(connection.new_blocked_list) == 0: if len(connection.new_blocked_list) == 0:
connection.blocked_list = [] connection.blocked_list = []
connection.blocked_contacts = [] connection.blocked_contacts = []
@ -2809,6 +2808,8 @@ class GroupchatControl(ChatControlBase):
if 'privay_list_block' in gajim.interface.instances[self.account]: if 'privay_list_block' in gajim.interface.instances[self.account]:
del gajim.interface.instances[self.account]\ del gajim.interface.instances[self.account]\
['privay_list_block'] ['privay_list_block']
else:
connection.set_privacy_list(default, connection.new_blocked_list)
def on_voice_checkmenuitem_activate(self, widget, nick): def on_voice_checkmenuitem_activate(self, widget, nick):
if widget.get_active(): if widget.get_active():