Skip to content
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

desktop: add screen sharing support #12003

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

ShGKme
Copy link
Contributor

@ShGKme ShGKme commented Apr 4, 2024

☑️ Resolves

🖌️ UI Checklist

🚧 Tasks

  • On Desktop - do not consider screen share unsupported
  • On Desktop on screen sharing - get media source to share from Talk Desktop API

🏁 Checklist

  • 🌏 Tested with Chrome, Firefox and Safari or should not be risky to browser differences
  • 🖥️ Tested with Desktop client or should not be risky for it
  • 🖌️ Design was reviewed, approved or inspired by the design team
  • ⛑️ Tests are included or not possible
  • 📗 User documentation in https://github.com/nextcloud/documentation/tree/master/user_manual/talk has been updated or is not required

@nickvergessen
Copy link
Member

/backport to stable29

@ShGKme ShGKme force-pushed the desktop/screen-sharing-support branch from 0ff3a50 to ff633a8 Compare April 4, 2024 12:15
@ShGKme ShGKme marked this pull request as ready for review April 4, 2024 12:26
Comment on lines -37 to 41
if (typeof window === 'undefined' || window.location.protocol === 'http:') {
if (!IS_DESKTOP && (typeof window === 'undefined' || window.location.protocol === 'http:')) {
error = new Error('NavigatorUserMediaError')
error.name = 'HTTPS_REQUIRED'
return callback(error)
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P.S. This code block seems to be never actually used. We check screenSharing support in the button handler anyway.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this code is a library called simplewebrtc which was discontinued and then copied into our source :P

@ShGKme ShGKme requested a review from danxuliu April 4, 2024 12:27
@ShGKme
Copy link
Contributor Author

ShGKme commented Apr 4, 2024

Back to draft. One case is missing - sharing all the screens at the same time together with the audio. It is a special case in Electron :(

@ShGKme ShGKme marked this pull request as draft April 4, 2024 12:29
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
@ShGKme ShGKme force-pushed the desktop/screen-sharing-support branch from ff633a8 to a4f3607 Compare April 4, 2024 12:57
@ShGKme ShGKme marked this pull request as ready for review April 4, 2024 12:57
@nickvergessen nickvergessen merged commit fcdc529 into main Apr 4, 2024
48 checks passed
@nickvergessen nickvergessen deleted the desktop/screen-sharing-support branch April 4, 2024 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants