|
@@ -6,7 +6,7 @@ import { APP_WILL_MOUNT } from '../../app';
|
6
|
6
|
import {
|
7
|
7
|
CONFERENCE_FAILED,
|
8
|
8
|
CONFERENCE_LEFT,
|
9
|
|
- CONFERENCE_WILL_JOIN,
|
|
9
|
+ CONFERENCE_JOINED,
|
10
|
10
|
SET_AUDIO_ONLY
|
11
|
11
|
} from '../../base/conference';
|
12
|
12
|
import { MiddlewareRegistry } from '../../base/redux';
|
|
@@ -32,7 +32,16 @@ MiddlewareRegistry.register(({ getState }) => next => action => {
|
32
|
32
|
mode = AudioMode.DEFAULT;
|
33
|
33
|
break;
|
34
|
34
|
|
35
|
|
- case CONFERENCE_WILL_JOIN:
|
|
35
|
+ /*
|
|
36
|
+ * NOTE: We moved the audio mode setting from CONFERENCE_WILL_JOIN to
|
|
37
|
+ * CONFERENCE_JOINED because in case of a locked room, the app goes
|
|
38
|
+ * through CONFERENCE_FAILED state and gets to CONFERENCE_JOINED only
|
|
39
|
+ * after a correct password, so we want to make sure we have the correct
|
|
40
|
+ * audio mode set up when we finally get to the conf, but also make sure
|
|
41
|
+ * that the app is in the right audio mode if the user leaves the
|
|
42
|
+ * conference after the password prompt appears.
|
|
43
|
+ */
|
|
44
|
+ case CONFERENCE_JOINED:
|
36
|
45
|
case SET_AUDIO_ONLY: {
|
37
|
46
|
if (getState()['features/base/conference'].conference
|
38
|
47
|
|| action.conference) {
|