Fix invitations from a non sugar client (empathy), part of OLPC #10814

This does bring back the 'invitation from a non-sugar client'
functionality based on the 0.84 code. I did remove the part
where we claim to handle as well video invitations for now,
as we can not handle them.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/jarabe/model/telepathyclient.py b/src/jarabe/model/telepathyclient.py
index c5a1f9f..2604af6 100644
--- a/src/jarabe/model/telepathyclient.py
+++ b/src/jarabe/model/telepathyclient.py
@@ -27,6 +27,7 @@ from telepathy.interfaces import CLIENT, \
 from telepathy.server import DBusProperties
 
 from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM
+from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT
 
 from sugar import dispatch
 
@@ -67,13 +68,20 @@ class TelepathyClient(dbus.service.Object, DBusProperties):
         return dbus.Array([filter_dict], signature='a{sv}')
 
     def __get_filters_approver_cb(self):
-        filt = {
+        activity_invitation = {
             CHANNEL + '.ChannelType': CHANNEL_TYPE_TEXT,
             CHANNEL + '.TargetHandleType': CONNECTION_HANDLE_TYPE_ROOM,
             }
-        filter_dict = dbus.Dictionary(filt, signature='sv')
+        filter_dict = dbus.Dictionary(activity_invitation, signature='sv')
         filters = dbus.Array([filter_dict], signature='a{sv}')
 
+        text_invitation = {
+            CHANNEL + '.ChannelType': CHANNEL_TYPE_TEXT,
+            CHANNEL + '.TargetHandleType': CONNECTION_HANDLE_TYPE_CONTACT,
+            }
+        filter_dict = dbus.Dictionary(text_invitation, signature='sv')
+        filters.append(filter_dict)
+
         logging.debug('__get_filters_approver_cb %r', filters)
 
         return filters