projects
/
theonering
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing a tp bug preventing channels from closing
[theonering]
/
src
/
aliasing.py
diff --git
a/src/aliasing.py
b/src/aliasing.py
index
936ff70
..
96c4dc3
100644
(file)
--- a/
src/aliasing.py
+++ b/
src/aliasing.py
@@
-101,7
+101,14
@@
class AliasingMixin(tp.ConnectionInterfaceAliasing):
"""
raise NotImplementedError("Abstract property called")
"""
raise NotImplementedError("Abstract property called")
- def handle(self, handleType, handleId):
+ @property
+ def callbackNumberParameter(self):
+ """
+ @abstract
+ """
+ raise NotImplementedError("Abstract property called")
+
+ def get_handle_by_id(self, handleType, handleId):
"""
@abstract
"""
"""
@abstract
"""
@@
-137,18
+144,18
@@
class AliasingMixin(tp.ConnectionInterfaceAliasing):
else:
raise telepathy.errors.PermissionDenied("No user customizable aliases")
else:
raise telepathy.errors.PermissionDenied("No user customizable aliases")
- if len(alias) == 0:
+ uglyNumber = util_misc.normalize_number(alias)
+ if len(uglyNumber) == 0:
# Reset to the original from login if one was provided
# Reset to the original from login if one was provided
- alias = self.callbackNumberParameter
- if not util_misc.is_valid_number(alias):
- raise telepathy.errors.InvalidArgument("Invalid phone number %r" % (alias, ))
+ uglyNumber = self.callbackNumberParameter
+ if not util_misc.is_valid_number(uglyNumber):
+ raise telepathy.errors.InvalidArgument("Invalid phone number %r" % (uglyNumber, ))
# Update callback
# Update callback
- uglyNumber = util_misc.normalize_number(alias)
self.session.backend.set_callback_number(uglyNumber)
# Inform of change
self.session.backend.set_callback_number(uglyNumber)
# Inform of change
- userAlias = make_pretty(alias)
+ userAlias = make_pretty(uglyNumber)
changedAliases = ((handleId, userAlias), )
self.AliasesChanged(changedAliases)
changedAliases = ((handleId, userAlias), )
self.AliasesChanged(changedAliases)
@@
-159,9
+166,9
@@
class AliasingMixin(tp.ConnectionInterfaceAliasing):
userAlias = make_pretty(aliasNumber)
return userAlias
else:
userAlias = make_pretty(aliasNumber)
return userAlias
else:
- contactId = h.contactID
- if contactId:
- contactAlias = self.session.addressbook.get_contact_name(contactId)
- else:
- contactAlias = make_pretty(h.phoneNumber)
+ number = h.phoneNumber
+ try:
+ contactAlias = self.session.addressbook.get_contact_name(number)
+ except KeyError:
+ contactAlias = make_pretty(number)
return contactAlias
return contactAlias