This PR changes the logic for connecting / disconnecting conferences. Instead of doing it in mount / unmount events from the Conference component, it moves the logic to the appNavigatee action. This fixes a regression introduced in 774c5ecd when trying to make sure the conference terminated event is always sent. By moving the logic to appNavigate we no longer depend on side-effects for connecting / disconnecting, and the code should be more maintainable moving forward. An improvement to this is the concept of sessions, which, while not tackled here, was taken into consideration.master
|
|
||
| 10 |
|
10 |
|
| 11 |
|
11 |
|
| 12 |
|
12 |
|
| 13 |
|
|
|
|
13 |
|
|
| 14 |
|
14 |
|
|
15 |
|
|
| 15 |
|
16 |
|
| 16 |
|
17 |
|
| 17 |
|
18 |
|
|
|
||
| 58 |
|
59 |
|
| 59 |
|
60 |
|
| 60 |
|
61 |
|
|
62 |
|
|
|
63 |
|
|
|
64 |
|
|
|
65 |
|
|
|
66 |
|
|
|
67 |
|
|
| 61 |
|
68 |
|
| 62 |
|
69 |
|
| 63 |
|
70 |
|
|
|
||
| 87 |
|
94 |
|
| 88 |
|
95 |
|
| 89 |
|
96 |
|
| 90 |
|
|
|
| 91 |
|
|
|
| 92 |
|
|
|
| 93 |
|
|
|
| 94 |
|
|
|
|
97 |
|
|
| 95 |
|
98 |
|
|
99 |
|
|
|
100 |
|
|
|
101 |
|
|
|
102 |
|
|
|
103 |
|
|
|
104 |
|
|
|
105 |
|
|
|
106 |
|
|
|
107 |
|
|
|
108 |
|
|
|
109 |
|
|
|
110 |
|
|
| 96 |
|
111 |
|
| 97 |
|
112 |
|
| 98 |
|
113 |
|
|
|
||
| 24 |
|
24 |
|
| 25 |
|
25 |
|
| 26 |
|
26 |
|
| 27 |
|
|
|
| 28 |
|
27 |
|
| 29 |
|
28 |
|
| 30 |
|
29 |
|
|
|
||
| 37 |
|
36 |
|
| 38 |
|
37 |
|
| 39 |
|
38 |
|
| 40 |
|
|
|
| 41 |
|
|
|
|
39 |
|
|
| 42 |
|
40 |
|
| 43 |
|
41 |
|
| 44 |
|
42 |
|
|
|
||
| 99 |
|
97 |
|
| 100 |
|
98 |
|
| 101 |
|
99 |
|
| 102 |
|
|
|
| 103 |
|
|
|
| 104 |
|
|
|
| 105 |
|
100 |
|
| 106 |
|
101 |
|
| 107 |
|
102 |
|
|
|
||
| 566 |
|
561 |
|
| 567 |
|
562 |
|
| 568 |
|
563 |
|
| 569 |
|
|
|
| 570 |
|
|
|
| 571 |
|
|
|
| 572 |
|
|
|
| 573 |
|
|
|
| 574 |
|
|
|
| 575 |
|
|
|
| 576 |
|
|
|
| 577 |
|
|
|
| 578 |
|
|
|
| 579 |
|
|
|
| 580 |
|
|
|
| 581 |
|
|
|
| 582 |
|
|
|
| 583 |
|
|
|
| 584 |
|
|
|
| 585 |
|
|
|
| 586 |
|
|
|
| 587 |
|
|
|
| 588 |
|
|
|
| 589 |
|
|
|
| 590 |
|
|
|
| 591 |
|
|
|
| 592 |
|
|
|
| 593 |
|
|
|
| 594 |
|
|
|
| 595 |
|
|
|
| 596 |
|
|
|
| 597 |
|
|
|
| 598 |
|
|
|
| 599 |
|
|
|
| 600 |
|
|
|
| 601 |
|
|
|
| 602 |
|
|
|
| 603 |
|
|
|
| 604 |
|
|
|
| 605 |
|
|
|
| 606 |
|
|
|
| 607 |
|
|
|
| 608 |
|
|
|
| 609 |
|
|
|
| 610 |
|
|
|
| 611 |
|
|
|
| 612 |
|
|
|
| 613 |
|
|
|
| 614 |
|
564 |
|
| 615 |
|
565 |
|
| 616 |
|
566 |
|
|
|
||
| 370 |
|
370 |
|
| 371 |
|
371 |
|
| 372 |
|
372 |
|
| 373 |
|
|
|
| 374 |
|
|
|
| 375 |
|
|
|
| 376 |
|
|
|
|
373 |
|
|
| 377 |
|
374 |
|
| 378 |
|
375 |
|
| 379 |
|
376 |
|
|
|
||
| 5 |
|
5 |
|
| 6 |
|
6 |
|
| 7 |
|
7 |
|
| 8 |
|
|
|
| 9 |
|
8 |
|
| 10 |
|
9 |
|
| 11 |
|
10 |
|
|
|
||
| 14 |
|
13 |
|
| 15 |
|
14 |
|
| 16 |
|
15 |
|
| 17 |
|
|
|
| 18 |
|
16 |
|
| 19 |
|
17 |
|
| 20 |
|
18 |
|
|
|
||
| 66 |
|
64 |
|
| 67 |
|
65 |
|
| 68 |
|
66 |
|
| 69 |
|
|
|
| 70 |
|
|
|
| 71 |
|
|
|
| 72 |
|
|
|
| 73 |
|
|
|
| 74 |
|
|
|
| 75 |
|
|
|
| 76 |
|
|
|
| 77 |
|
|
|
| 78 |
|
|
|
| 79 |
|
|
|
| 80 |
|
|
|
| 81 |
|
|
|
| 82 |
|
|
|
| 83 |
|
|
|
| 84 |
|
|
|
| 85 |
|
|
|
| 86 |
|
|
|
| 87 |
|
|
|
| 88 |
|
|
|
| 89 |
|
|
|
| 90 |
|
|
|
| 91 |
|
|
|
| 92 |
|
67 |
|
| 93 |
|
68 |
|
| 94 |
|
69 |
|
|
|
||
| 166 |
|
141 |
|
| 167 |
|
142 |
|
| 168 |
|
143 |
|
| 169 |
|
|
|
| 170 |
|
|
|
| 171 |
|
144 |
|
| 172 |
|
145 |
|
| 173 |
|
146 |
|
|
|
||
| 184 |
|
157 |
|
| 185 |
|
158 |
|
| 186 |
|
159 |
|
| 187 |
|
|
|
|
160 |
|
|
| 188 |
|
161 |
|
| 189 |
|
|
|
| 190 |
|
|
|
| 191 |
|
|
|
| 192 |
|
|
|
|
162 |
|
|
|
163 |
|
|
| 193 |
|
164 |
|
| 194 |
|
|
|
| 195 |
|
165 |
|
| 196 |
|
|
|
| 197 |
|
166 |
|
| 198 |
|
167 |
|
| 199 |
|
168 |
|
| 200 |
|
169 |
|
| 201 |
|
|
|
| 202 |
|
|
|
| 203 |
|
|
|
| 204 |
|
|
|
| 205 |
|
|
|
| 206 |
|
|
|
| 207 |
|
170 |
|
| 208 |
|
171 |
|
| 209 |
|
172 |
|
|
|
||
| 228 |
|
191 |
|
| 229 |
|
192 |
|
| 230 |
|
193 |
|
| 231 |
|
|
|
| 232 |
|
|
|
| 233 |
|
194 |
|
| 234 |
|
195 |
|
| 235 |
|
196 |
|
|
|
||
| 396 |
|
357 |
|
| 397 |
|
358 |
|
| 398 |
|
359 |
|
| 399 |
|
|
|
| 400 |
|
|
|
| 401 |
|
360 |
|
| 402 |
|
361 |
|
| 403 |
|
362 |
|
| 404 |
|
363 |
|
| 405 |
|
364 |
|
| 406 |
|
365 |
|
| 407 |
|
|
|
| 408 |
|
|
|
| 409 |
|
|
|
| 410 |
|
|
|
| 411 |
|
|
|
| 412 |
|
|
|
| 413 |
|
|
|
| 414 |
|
|
|
| 415 |
|
|
|
| 416 |
|
|
|
| 417 |
|
|
|
| 418 |
|
|
|
| 419 |
|
|
|
| 420 |
|
|
|
| 421 |
|
|
|
| 422 |
|
|
|
| 423 |
|
|
|
| 424 |
|
|
|
| 425 |
|
|
|
| 426 |
|
|
|
| 427 |
|
|
|
| 428 |
|
|
|
| 429 |
|
366 |
|
| 430 |
|
367 |
|
| 431 |
|
368 |
|
|
|
||
| 462 |
|
399 |
|
| 463 |
|
400 |
|
| 464 |
|
401 |
|
| 465 |
|
|
|
| 466 |
|
|
|
|
402 |
|
|
| 467 |
|
403 |
|
| 468 |
|
404 |
|
| 469 |
|
405 |
|
|
|
||
| 508 |
|
444 |
|
| 509 |
|
445 |
|
| 510 |
|
446 |
|
| 511 |
|
|
|
| 512 |
|
|
|
| 513 |
|
|
|
| 514 |
|
|
|
| 515 |
|
|
|
| 516 |
|
|
|
| 517 |
|
|
|
| 518 |
|
|
|
| 519 |
|
447 |
|
| 520 |
|
448 |
|
| 521 |
|
449 |
|
|
|
||
| 1 |
|
1 |
|
| 2 |
|
2 |
|
|
3 |
|
|
| 3 |
|
4 |
|
| 4 |
|
5 |
|
| 5 |
|
6 |
|
|
|
||
| 26 |
|
27 |
|
| 27 |
|
28 |
|
| 28 |
|
29 |
|
|
30 |
|
|
|
31 |
|
|
| 29 |
|
32 |
|
| 30 |
|
33 |
|
| 31 |
|
34 |
|
| 32 |
|
35 |
|
|
36 |
|
|
|
37 |
|
|
|
38 |
|
|
|
39 |
|
|
|
40 |
|
|
|
41 |
|
|
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
|
56 |
|
|
| 33 |
|
57 |
|
| 34 |
|
58 |
|
| 35 |
|
59 |
|
|
|
||
| 38 |
|
62 |
|
| 39 |
|
63 |
|
| 40 |
|
64 |
|
| 41 |
|
|
|
| 42 |
|
|
|
| 43 |
|
|
|
| 44 |
|
|
|
| 45 |
|
|
|
| 46 |
|
|
|
| 47 |
|
|
|
| 48 |
|
|
|
|
65 |
|
|
| 49 |
|
66 |
|
| 50 |
|
67 |
|
| 51 |
|
68 |
|