emdee/toxygen
1
0
Fork 0
Code Issues 1 Pull Requests Actions Wiki Activity

utf-8 decoding moved from contacts

Browse Source
This commit is contained in:
ingvar1995 2018-05-19 19:38:54 +03:00
parent a935d602f8
commit b591ac13ba
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toxygen/contacts/basecontact.py
View File

@ -39,7 +39,6 @@ class BaseContact:
return self._name return self._name
def set_name(self, value): def set_name(self, value):
value = str(value, 'utf-8')
if self._name != value: if self._name != value:
self._name = value self._name = value
self._widget.name.setText(self._name) self._widget.name.setText(self._name)
@ -61,7 +60,6 @@ class BaseContact:
return self._status_message return self._status_message
def set_status_message(self, value): def set_status_message(self, value):
value = str(value, 'utf-8')
if self._status_message != value: if self._status_message != value:
self._status_message = value self._status_message = value
self._widget.status_message.setText(self._status_message) self._widget.status_message.setText(self._status_message)

1
toxygen/contacts/contacts_manager.py
View File

@ -224,7 +224,6 @@ class ContactsManager:
friend = self.get_friend_by_number(number) friend = self.get_friend_by_number(number)
tmp = friend.name tmp = friend.name
friend.set_name(name) friend.set_name(name)
name = str(name, 'utf-8')
if friend.name == name and tmp != name: if friend.name == name and tmp != name:
# TODO: move to friend? # TODO: move to friend?
message = util_ui.tr('User {} is now known as {}') message = util_ui.tr('User {} is now known as {}')

2
toxygen/contacts/profile.py
View File

@ -49,7 +49,7 @@ class Profile(basecontact.BaseContact):
def set_name(self, value): def set_name(self, value):
if self.name == value: if self.name == value:
return return
super().set_name(value.encode('utf-8')) super().set_name(value)
self._tox.self_set_name(self._name.encode('utf-8')) self._tox.self_set_name(self._name.encode('utf-8'))
def set_status_message(self, value): def set_status_message(self, value):

4
toxygen/groups/groups_service.py
View File

@ -53,8 +53,8 @@ class GroupsService(tox_save.ToxSave):
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
def update_group_info(self, group): def update_group_info(self, group):
group.name = self._tox.group_get_name(group.number).encode('utf-8') group.name = self._tox.group_get_name(group.number)
group.status_message = self._tox.group_get_topic(group.number).encode('utf-8') group.status_message = self._tox.group_get_topic(group.number)
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
# Private methods # Private methods

4
toxygen/middleware/callbacks.py
View File

@ -86,7 +86,7 @@ def friend_name(contacts_manager):
Friend changed his name Friend changed his name
""" """
print('New name friend #' + str(friend_number)) print('New name friend #' + str(friend_number))
invoke_in_main_thread(contacts_manager.new_name, friend_number, name) invoke_in_main_thread(contacts_manager.new_name, friend_number, str(name, 'utf-8'))
return wrapped return wrapped
@ -98,7 +98,7 @@ def friend_status_message(contacts_manager, messenger):
and calls window repaint and calls window repaint
""" """
friend = contacts_manager.get_friend_by_number(friend_number) friend = contacts_manager.get_friend_by_number(friend_number)
invoke_in_main_thread(friend.set_status_message, status_message) invoke_in_main_thread(friend.set_status_message, str(status_message, 'utf-8'))
print('User #{} has new status'.format(friend_number)) print('User #{} has new status'.format(friend_number))
invoke_in_main_thread(messenger.send_messages, friend_number) invoke_in_main_thread(messenger.send_messages, friend_number)

2
toxygen/ui/menu.py
View File

@ -272,7 +272,7 @@ class ProfileSettings(CenteredWidget):
def closeEvent(self, event): def closeEvent(self, event):
self._profile.set_name(self.nick.text()) self._profile.set_name(self.nick.text())
self._profile.set_status_message(self.status_message.text().encode('utf-8')) self._profile.set_status_message(self.status_message.text())
self._profile.set_status(self.status.currentIndex()) self._profile.set_status(self.status.currentIndex())