-
Notifications
You must be signed in to change notification settings - Fork 242
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow activities to pass file transfers without shell notification #621
base: master
Are you sure you want to change the base?
Allow activities to pass file transfers without shell notification #621
Conversation
File transfer channels are a powerful solution for transfering data 1-to-1 over telepathy. However, currently the shell will try to claim all file transfer channels and show a notification to the user. This commit makes the shell ignore the channel if it has the content type of 'x-sugar/from-activity'. It will instead pass it to the telepathy client specified in the file name. The file name was used to house the client name because there does not appear to be a dedicated place for this information in telepathy. Activities can still use the description to store their metadata.
Could somebody please test this? It would be great if this is merged in 108, as this is useful for better usage of the collab wrapper. You can easily test with physics activity from git [1]. To test, run physics ans share it with a buddy. If the buddy does have the patch applied:
[1] https://github.com/walterbender/physics |
Unfortunately I can't test physics at the moment due to 4926. |
I will give it a try. |
Hey @samdroid-apps, can you clarify something? I tested collaboration with physics (master [1]) using two laptops (fedora 23 x86_64 without broot), with and without this patch, and there was no difference at all: With or without the patch the result is the same:
Ideas? [1] https://github.com/walterbender/physics |
My apologies, I did not notice that physics does not have get_data or set_data (initial state sync). This does not appear to be a regression [1]. I have double checked that Bibliography activity is a suitable testing activity, as it uses the initial state sync and sends the file transfer. Please find bibliography version 4 the git repository [2]. It will hopefully soon be available on the ASLO (although even v3 is still in the review queue) [3]. Sorry for the bad test case. [1] sugarlabs/physics@e80f755 |
hey @samdroid-apps, I tested with [1] and now I see differences, but there still one thing off:
Are you not seeing this? I suspect there could logic hole. [1] https://github.com/SAMdroid-apps/bibliography-activity |
Hi @tchx84, thanks for testing. Can you share the logs (for shell and bibliography)? Logs with the log level set to debug would be awsome! I tested on fc24 over salut (not gabble, see samdroid-apps/collabwrapper#2) and observed the intended behaviour using the following procedure:
I did not observe any file transfer notifications or file transfer popups (empathy). Was your procedure significantly different from the one above? |
The only difference, in my test case, is that Alice don't invite Bob. Bob sees the shared activity in the neighborhood and joins. Everything else is identical, except for the result. Ill try to make some time to repeat these tests before Friday, but please try it with fc23 if you have it. We are just days away from the next release. |
Ok, so I attempted to test this with a GNOME Boxes fedora 23 to my fedora 24 computer over salut. It couldn't connect at all. I'll investigate an alternate way of testing, as I assume that the boxes network setup may have been causing issues. |
@samdroid-apps I use VirtualBox, setting network device to "bridged". Very useful for this kind of tests. |
Heh, virtualbox kernel module doesn't build on rawhide. I'm trapped in the instability! I tried installing on an XO, but how would you guess that mixing and matching fedora ans sugar versions would not end well. I'll try and find another way, but please send through the logs if you can @tchx84! |
@samdroid-apps wrote:
Why not? This mixing works fine for me. Try harder? |
@samdroid-apps you mean the virtual box additions? I never needed them for testing this. Anyway, lets keep focusing on this fix, so we land it before the final release. |
Did this land in the final release? |
@davelab6, the simplest method to check is to read the first patch band, locate the file, and examine the text to see if the patch was applied. For _new_channels_cb functiion in filetransfer.py, as of now, the patch hasn't been applied. Also, for users who may merge pull requests, GitHub shows a "This branch has no conflicts with the base branch. Merging can be performed automatically." If the patch or a derivative was merged in another pull request, GitHub would likely show a conflict and we would ask for a rebase. |
@quozl thank you for explaining :D |
I should test this. I setup an old machine with fc23 soas just to do this, but then I forgot completely. I'll try again tommorow. |
This was supposed to be in 0.108 D: Can you test @samdroid-apps ? |
File transfer channels are a powerful solution for transfering data
1-to-1 over telepathy. However, currently the shell will try to
claim all file transfer channels and show a notification to the
user.
This commit makes the shell ignore the channel if it has the
content type of 'x-sugar/from-activity'. It will instead pass it
to the telepathy client specified in the file name. The file name
was used to house the client name because there does not appear
to be a dedicated place for this information in telepathy.
Activities can still use the description to store their metadata.
Note: This patch makes a lot more sense with the new collab wrapper patch. There is lots of lines changed in the collab wrapper to use file transfers. I need to review those myself to before I can share that. I will update this pull request when that happens.