Properly handle wakelock, fixes #237

This commit is contained in:
Håvar Aambø Fosstveit
2020-04-22 10:01:58 +02:00
parent e28b6cdc5d
commit 1cef52a3a1
7 changed files with 29 additions and 24 deletions
+1 -1
View File
@@ -385,7 +385,7 @@ const Me = (props) =>
</Fab>
</div>
</Tooltip>
{ !me.isMobile &&
{ me.browser.platform !== 'mobile' &&
<Tooltip title={screenTip} placement='left'>
<div>
<Fab
+6 -6
View File
@@ -121,7 +121,7 @@ const Peer = (props) =>
advancedMode,
peer,
activeSpeaker,
isMobile,
browser,
micConsumer,
webcamConsumer,
screenConsumer,
@@ -260,7 +260,7 @@ const Peer = (props) =>
</div>
</Tooltip>
{ !isMobile &&
{ browser.platform !== 'mobile' &&
<Tooltip
title={intl.formatMessage({
id : 'label.newWindow',
@@ -408,7 +408,7 @@ const Peer = (props) =>
}, 2000);
}}
>
{ !isMobile &&
{ browser.platform !== 'mobile' &&
<Tooltip
title={intl.formatMessage({
id : 'label.newWindow',
@@ -509,7 +509,7 @@ Peer.propTypes =
screenConsumer : appPropTypes.Consumer,
windowConsumer : PropTypes.string,
activeSpeaker : PropTypes.bool,
isMobile : PropTypes.bool,
browser : PropTypes.object.isRequired,
spacing : PropTypes.number,
style : PropTypes.object,
smallButtons : PropTypes.bool,
@@ -530,7 +530,7 @@ const makeMapStateToProps = (initialState, { id }) =>
...getPeerConsumers(state, id),
windowConsumer : state.room.windowConsumer,
activeSpeaker : id === state.room.activeSpeakerId,
isMobile : state.me.isMobile
browser : state.me.browser
};
};
@@ -565,7 +565,7 @@ export default withRoomContext(connect(
prev.consumers === next.consumers &&
prev.room.activeSpeakerId === next.room.activeSpeakerId &&
prev.room.windowConsumer === next.room.windowConsumer &&
prev.me.isMobile === next.me.isMobile
prev.me.browser === next.me.browser
);
}
}
+5 -5
View File
@@ -139,7 +139,7 @@ class Room extends React.PureComponent
{
const {
room,
isMobile,
browser,
advancedMode,
toolAreaOpen,
toggleToolArea,
@@ -204,7 +204,7 @@ class Room extends React.PureComponent
</Hidden>
</nav>
{ isMobile &&
{ browser.platform === 'mobile' && browser.os !== 'ios' &&
<WakeLock />
}
@@ -225,7 +225,7 @@ class Room extends React.PureComponent
Room.propTypes =
{
room : appPropTypes.Room.isRequired,
isMobile : PropTypes.bool.isRequired,
browser : PropTypes.object.isRequired,
advancedMode : PropTypes.bool.isRequired,
toolAreaOpen : PropTypes.bool.isRequired,
setToolbarsVisible : PropTypes.func.isRequired,
@@ -237,7 +237,7 @@ Room.propTypes =
const mapStateToProps = (state) =>
({
room : state.room,
isMobile : state.me.isMobile,
browser : state.me.browser,
advancedMode : state.settings.advancedMode,
toolAreaOpen : state.toolarea.toolAreaOpen
});
@@ -263,7 +263,7 @@ export default connect(
{
return (
prev.room === next.room &&
prev.me.isMobile === next.me.isMobile &&
prev.me.browser === next.me.browser &&
prev.settings.advancedMode === next.settings.advancedMode &&
prev.toolarea.toolAreaOpen === next.toolarea.toolAreaOpen
);