friendstray does represent buddies of a shared activity we have not joined yet

[erikos]

Steps to reproduce:

A: share Activity

B: in the friendstray of B you will see A and B even so we have not joined the shared activity yet.

We listen to activity-added from the neighborhood model, but this is emitted whenever a new activity is added to the neighborhood view not when we have joined it.

Related commits: ef45d2946f45ebfd3c50154b74c2b53b936724a9

[erikos]

diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py
index 31a9809..4055340 100644
--- a/src/jarabe/frame/friendstray.py
+++ b/src/jarabe/frame/friendstray.py
@@ -75,6 +75,10 @@ class FriendsTray(VTray):
     def __neighborhood_activity_added_cb(self, neighborhood_model,
                                          shared_activity):
         logging.debug('FriendsTray.__neighborhood_activity_added_cb')
+        active_activity = shell.get_model().get_active_activity()
+        if active_activity.get_activity_id() != shared_activity.activity_id:
+            return
+
         self.clear()
 
         # always display ourselves

The code path that listens for the 'activity-added' signal is used to track the following use case: 'A' starts an activity (he gets the 'active-activity-changed' signal from the shell), he then at a later point shares the activity. In order to track joining/leaving buddies he needs to get the shared activity. On other machines if we receive the 'activity-added' signal we can ignore it, therefore the check if the current active activity is the shared one.

[erikos]

Sent above patch for review: http://lists.sugarlabs.org/archive/sugar-devel/2011-June/032028.html

[erikos]

When testing please be aware that #10801 is not fixed yet.

[erikos]

sugar-0.92.2.9.gb092121-1.fc14.olpc.noarch.rpm, build 871

[godiard]

Working in 871

[dsd]

Fails for me, confirmed twice. A=XO-1, B=XO-1.5, both running 11.2.0 candidate build 871

• Boot both laptops, connect to adhoc network, check that they can see each other in neighborhood view
• Open neighborhood view on B, press frame key to open frame
• Open Speak on A, enable sharing with entire neighborhood
• B's neighborhood view updates to show that A is sharing the activity, and at the same time, A appears in the friends tray in B's frame, even though B has not joined yet.

[dsd]

Wasn't shipped in build 871 as planned

Fixed in sugar-0.92.2.9.gb092121-1.fc14.olpc.noarch.rpm

[erikos]

sugar-0.92.3.1.gc106a82 is the exact build name, is in my public repo.

[dsd]

The above test case still fails for me in exactly the same way in 11.2.0 candidate build 873, which includes sugar-0.92.3.1.gc106a82

[erikos]

Is in sugar-0.92.3.4.g50b9373-1.fc14.olpc.noarch.rpm

When testing please be aware of #10801, which is not fixed yet.

[erikos]

Did land in 874.

Does work fine for me, tested in 874.

[dsd]

Now working for me in 11.2.0 candidate 874.

[erikos]

Made it as well upstream:

http://git.sugarlabs.org/sugar/mainline/commit/fd857d85d711ce8f80ef09aba492cad0c773d40b

http://git.sugarlabs.org/sugar/mainline/commit/7ccbfb2da266004d149e89020eda01ae50bcaee7