emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into next_gen

Browse source
This commit is contained in:
ingvar1995 2018-04-19 20:05:14 +03:00
commit 68328d9846
8 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
toxygen/contacts/profile.py
View file

@ -22,7 +22,7 @@ class Profile(basecontact.BaseContact):
"""
Profile of current toxygen user. Contains friends list, tox instance
"""
def __init__(self, profile_manager, tox, screen):
def __init__(self, profile_manager, tox, screen, file_transfer_handler):
"""
:param tox: tox instance
:param screen: ref to main screen
@ -33,6 +33,7 @@ class Profile(basecontact.BaseContact):
tox.self_get_status_message(),
screen.user_info,
tox.self_get_address())
self._file_transfer_handler = file_transfer_handler
self._screen = screen
self._messages = screen.messages
self._tox = tox
@ -42,7 +43,6 @@ class Profile(basecontact.BaseContact):
self._factory = items_factory.ItemsFactory(self._screen.friends_list, self._messages)
#self._show_avatars = settings['show_avatars']
# -----------------------------------------------------------------------------------------------------------------
# Edit current user's data
# -----------------------------------------------------------------------------------------------------------------
@ -318,11 +318,11 @@ class Profile(basecontact.BaseContact):
s.save()
def reset_avatar(self):
super(Profile, self).reset_avatar()
super().reset_avatar()
for friend in filter(lambda x: x.status is not None, self._contacts):
self.send_avatar(friend.number)
def set_avatar(self, data):
super(Profile, self).set_avatar(data)
super().set_avatar(data)
for friend in filter(lambda x: x.status is not None, self._contacts):
self.send_avatar(friend.number)