|
@@ -154,10 +154,11 @@ function _conferenceFailed({ getState }: IStore, next: Function, action: AnyActi
|
154
|
154
|
// prevented the user from joining a specific conference but the app may be
|
155
|
155
|
// able to eventually join the conference.
|
156
|
156
|
if (!action.error.recoverable) {
|
|
157
|
+ const { callUUID } = action.conference;
|
157
|
158
|
|
158
|
|
- if (action?.conference?.callUUID) {
|
|
159
|
+ if (callUUID) {
|
159
|
160
|
delete action.conference.callUUID;
|
160
|
|
- CallIntegration.reportCallFailed(action.conference.callUUIDID);
|
|
161
|
+ CallIntegration.reportCallFailed(callUUID);
|
161
|
162
|
}
|
162
|
163
|
}
|
163
|
164
|
|
|
@@ -184,9 +185,9 @@ function _conferenceJoined({ getState }: IStore, next: Function, action: AnyActi
|
184
|
185
|
return result;
|
185
|
186
|
}
|
186
|
187
|
|
187
|
|
- if (action?.conference?.callUUID) {
|
188
|
|
- const { callUUID } = action.conference;
|
|
188
|
+ const { callUUID } = action.conference;
|
189
|
189
|
|
|
190
|
+ if (callUUID) {
|
190
|
191
|
CallIntegration.reportConnectedOutgoingCall(callUUID)
|
191
|
192
|
.then(() => {
|
192
|
193
|
// iOS 13 doesn't like the mute state to be false before the call is started
|
|
@@ -229,9 +230,11 @@ function _conferenceLeft({ getState }: IStore, next: Function, action: AnyAction
|
229
|
230
|
return result;
|
230
|
231
|
}
|
231
|
232
|
|
232
|
|
- if (action?.conference?.callUUID) {
|
|
233
|
+ const { callUUID } = action.conference;
|
|
234
|
+
|
|
235
|
+ if (callUUID) {
|
233
|
236
|
delete action.conference.callUUID;
|
234
|
|
- CallIntegration.endCall(action.conference.callUUID);
|
|
237
|
+ CallIntegration.endCall(callUUID);
|
235
|
238
|
}
|
236
|
239
|
|
237
|
240
|
return result;
|
|
@@ -270,7 +273,7 @@ function _conferenceWillJoin({ dispatch, getState }: IStore, next: Function, act
|
270
|
273
|
}
|
271
|
274
|
|
272
|
275
|
// When assigning the call UUID, do so in upper case, since iOS will return
|
273
|
|
- // it upper cased.
|
|
276
|
+ // it upper-cased.
|
274
|
277
|
conference.callUUID = (callUUID || uuidv4()).toUpperCase();
|
275
|
278
|
|
276
|
279
|
CallIntegration.startCall(conference.callUUID, handle, hasVideo)
|