imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement widget ReceiveTerminate capability

Browse source 
Signed-off-by: Pauli Virtanen <pav@iki.fi>
This commit is contained in:
Pauli Virtanen 2020-04-18 17:04:56 +03:00
parent 94745e9407
commit 352ea29d17
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/elements/AppTile.js
View file

@ -344,10 +344,18 @@ export default class AppTile extends React.Component {
* @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
*/
_endWidgetActions() {
const timeout = 2000;
const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
let promise;
return Promise.race([messaging.terminate(), sleep(timeout)]).finally(() => {
if (this._hasCapability('m.receive_terminate')) {
// Wait for widget to terminate within a timeout
const timeout = 2000;
const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
promise = Promise.race([messaging.terminate(), sleep(timeout)]);
} else {
promise = Promise.resolve();
}
return promise.finally(() => {
// HACK: This is a really dirty way to ensure that Jitsi cleans up
// its hold on the webcam. Without this, the widget holds a media
// stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351