reimplement sugar.presence so it doesn't use the Presence Service

[tomeu]

As part of  http://wiki.sugarlabs.org/go/Features/RemovePresenceService, activities need to be able to use collaboration without the Presence Service being present.

This makes so without requiring activities to make any changes.

[tomeu]

Recently rebased:  http://git.sugarlabs.org/projects/sugar-toolkit/repos/nops

[erikos]

First of all, thanks for doing that awesome task!

A few first words while reading:

- please adjust the copyright in all the files you touch
- as discussed on irc: the debug logs are ok for now when we do heavy testing, I would like to remove them later and/or make them produce more accessible data

activity/activity.py:
- set_up one word: _set_up_sharing
- SUGAR_CLIENT_PATH = '/org/freedesktop/Telepathy/Client/Sugar' is unused
- self._handle.handle_invite: maybe call it 'invited'?

more to come...

[tomeu]

Done, thanks!

[erikos]

activity.py:

There are 4 cases we have to handle in the constructor: invited, join, share_previously_shared and the private case. I would probably put that into private methods and reflect that in the naming. Like:

if shared_instance is not None:
    self._join_instance()
elif share_scope != SCOPE_PRIVATE:
    self._share_previously_shared_instance(...)
else:
    self.__initialize_journal_object(...)

if handle.invited: does speak for itself. And as we nearly touch all mesh_instance cases please rename it :)

[erikos]

src/sugar/activity/activityhandle.py
- thanks for changing it to handle.invited

src/sugar/activity/activityservice.py
- (please add a comment that it is deprecated)
def Invite(self, buddy_key):

raise NotImplementedError

In the shell (jarabe.view.buddymenu) you are trying to call it:
logging.warning('Trying deprecated Activity.Invite')
service.Invite(self._buddy.props.key)
Does this handle cases where old Sugar versions share with new ones?

src/sugar/datastore/datastore.py
- self._object_id = None just a pylint fix, right?

src/sugar/presence/connectionmanager.py
- can you add a doc what it does and mark it unstable API as it is only of use to the sugar-PS?

src/sugar/presence/presenceservice.py
- please adjust the line: "UI class to access system-level presence object"
- please adjust the docstring: "UI-side interface to the dbus presence service..."
- remove the class OfflineInterface (not used anymore)
- remove the 'activity-disappeared' etc signals as the shell does not listen to them anymore. From the s\
ignals only 'activity-shared' seems to be in use.

Btw, all the approach looks really good!

[tomeu]

Replying to erikos:

src/sugar/activity/activityhandle.py
- thanks for changing it to handle.invited

src/sugar/activity/activityservice.py
- (please add a comment that it is deprecated)
def Invite(self, buddy_key):
raise NotImplementedError

Removed it, as all python activities will be using InviteContact.

In the shell (jarabe.view.buddymenu) you are trying to call it:
logging.warning('Trying deprecated Activity.Invite')
service.Invite(self._buddy.props.key)
Does this handle cases where old Sugar versions share with new ones?

That's there only for Etoys, which hasn't moved to the new API yet. All python activities are going to be using the new InviteContact.

src/sugar/datastore/datastore.py
- self._object_id = None just a pylint fix, right?

Yup.

src/sugar/presence/connectionmanager.py
- can you add a doc what it does and mark it unstable API as it is only of use to the sugar-PS?

src/sugar/presence/presenceservice.py
- please adjust the line: "UI class to access system-level presence object"
- please adjust the docstring: "UI-side interface to the dbus presence service..."

Done

- remove the class OfflineInterface (not used anymore)
- remove the 'activity-disappeared' etc signals as the shell does not listen to them anymore. From the s\
ignals only 'activity-shared' seems to be in use.

Done

Btw, all the approach looks really good!

Thanks for the review!

[erikos]

Ok, great! The integration bugs we will find when testing it in builds. Please help remembering to clean up the debug logs before hard code freeze.

[tomeu]

Merged, thanks!