|
|
@@ -9,7 +9,8 @@ import {
|
|
9
|
9
|
CONFERENCE_JOINED,
|
|
10
|
10
|
CONFERENCE_LEFT,
|
|
11
|
11
|
CONFERENCE_WILL_JOIN,
|
|
12
|
|
- SET_AUDIO_ONLY
|
|
|
12
|
+ SET_AUDIO_ONLY,
|
|
|
13
|
+ getCurrentConference
|
|
13
|
14
|
} from '../../base/conference';
|
|
14
|
15
|
import { Platform } from '../../base/react';
|
|
15
|
16
|
import { MiddlewareRegistry } from '../../base/redux';
|
|
|
@@ -50,10 +51,10 @@ MiddlewareRegistry.register(store => next => action => {
|
|
50
|
51
|
case CONFERENCE_JOINED:
|
|
51
|
52
|
case SET_AUDIO_ONLY: {
|
|
52
|
53
|
const result = next(action);
|
|
53
|
|
- const { audioOnly, conference, joining }
|
|
54
|
|
- = store.getState()['features/base/conference'];
|
|
|
54
|
+ const { audioOnly } = store.getState()['features/base/conference'];
|
|
|
55
|
+ const conference = getCurrentConference(store);
|
|
55
|
56
|
|
|
56
|
|
- _setFullScreen(conference || joining ? !audioOnly : false);
|
|
|
57
|
+ _setFullScreen(conference ? !audioOnly : false);
|
|
57
|
58
|
|
|
58
|
59
|
return result;
|
|
59
|
60
|
}
|
|
|
@@ -85,9 +86,9 @@ function _onImmersiveChange({ getState }) {
|
|
85
|
86
|
const { appState } = state['features/background'];
|
|
86
|
87
|
|
|
87
|
88
|
if (appState === 'active') {
|
|
88
|
|
- const { audioOnly, conference, joining }
|
|
89
|
|
- = state['features/base/conference'];
|
|
90
|
|
- const fullScreen = conference || joining ? !audioOnly : false;
|
|
|
89
|
+ const { audioOnly } = state['features/base/conference'];
|
|
|
90
|
+ const conference = getCurrentConference(state);
|
|
|
91
|
+ const fullScreen = conference ? !audioOnly : false;
|
|
91
|
92
|
|
|
92
|
93
|
_setFullScreen(fullScreen);
|
|
93
|
94
|
}
|