mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #608 from matrix-org/dbkr/move_screen_sharing_error

Browse source 
Move screen sharing error check into platform
This commit is contained in:
David Baker 2017-01-11 10:12:51 +00:00 committed by GitHub
commit e95f5b959f
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/BasePlatform.js
View file

@ -73,4 +73,13 @@ export default class BasePlatform {
getAppVersion() {
throw new Error("getAppVersion not implemented!");
}
/*
* If it's not expected that capturing the screen will work
* with getUserMedia, return a string explaining why not.
* Otherwise, return null.
*/
screenCaptureErrorString() {
return "Not implemented";
}
}

12
src/CallHandler.js
View file

@ -52,6 +52,7 @@ limitations under the License.
*/
var MatrixClientPeg = require('./MatrixClientPeg');
var PlatformPeg = require("./PlatformPeg");
var Modal = require('./Modal');
var sdk = require('./index');
var Matrix = require("matrix-js-sdk");
@ -187,6 +188,17 @@ function _onAction(payload) {
);
}
else if (payload.type === 'screensharing') {
const screenCapErrorString = PlatformPeg.get().screenCaptureErrorString();
if (screenCapErrorString) {
_setCallState(undefined, newCall.roomId, "ended");
console.log("Can't capture screen: " + screenCapErrorString);
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Unable to capture screen",
description: screenCapErrorString
});
return;
}
newCall.placeScreenSharingCall(
payload.remote_element,
payload.local_element