OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Ensures that p2p/group calls are in progress to reject new call invitations, and emits a call reject events.

This commit is contained in:
cloudwebrtc 2022-09-14 23:07:32 +08:00
parent b203b5dacb
commit 62cca99edd
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/src/voip/call.dart
View File

@ -932,17 +932,16 @@ class CallSession {
/// This used to be done by calling hangup, but is a separate method and protocol
/// event as of MSC2746.
///
Future<void> reject() async {
Future<void> reject({String? reason, bool shouldEmit = true}) async {
// stop play ringtone
voip.delegate.stopRingtone();
if (state != CallState.kRinging) {
Logs().e('[VOIP] Call must be in \'ringing\' state to reject!');
if (state != CallState.kRinging && state != CallState.kFledgling) {
Logs().e('[VOIP] Call must be in \'ringing|fledgling\' state to reject!');
return;
}
Logs().d('[VOIP] Rejecting call: $callId');
await terminate(CallParty.kLocal, CallErrorCode.UserHangup, true);
await sendCallReject(room, callId, lifetimeMs, localPartyId);
await terminate(CallParty.kLocal, CallErrorCode.UserHangup, shouldEmit);
await sendCallReject(room, callId, lifetimeMs, localPartyId, reason);
}
Future<void> hangup([String? reason, bool suppressEvent = true]) async {
@ -987,15 +986,15 @@ class CallSession {
hangupParty = party;
hangupReason = reason;
setCallState(CallState.kEnded);
if (shouldEmit) {
setCallState(CallState.kEnded);
}
voip.currentCID = null;
voip.calls.remove(callId);
await cleanUp();
onCallHangup.add(this);
voip.delegate.handleCallEnded(this);
if (shouldEmit) {
onCallHangup.add(this);
voip.delegate.handleCallEnded(this);
fireCallEvent(CallEvent.kHangup);
}
}
@ -1432,7 +1431,7 @@ class CallSession {
/// [version] is the version of the VoIP specification this message adheres to. This specification is version 1.
/// [party_id] The party ID for call, Can be set to client.deviceId.
Future<String?> sendCallReject(
Room room, String callId, int lifetime, String party_id,
Room room, String callId, int lifetime, String party_id, String? reason,
{String version = voipProtoVersion, String? txid}) async {
txid ??= 'txid${DateTime.now().millisecondsSinceEpoch}';
@ -1440,6 +1439,7 @@ class CallSession {
'call_id': callId,
'party_id': party_id,
if (groupCallId != null) 'conf_id': groupCallId,
if (reason != null) 'reason': reason,
'version': version,
'lifetime': lifetime,
};

18
lib/src/voip/voip.dart
View File

@ -19,12 +19,12 @@ abstract class WebRTCDelegate {
void stopRingtone();
void handleNewCall(CallSession session);
void handleCallEnded(CallSession session);
void handleMissedCall(CallSession session);
void handleNewGroupCall(GroupCall groupCall);
void handleGroupCallEnded(GroupCall groupCall);
bool get isBackgroud;
bool get isWeb;
bool get canHandleNewCall => true;
}
class VoIP {
@ -200,10 +200,20 @@ class VoIP {
newCall.opponentDeviceId = deviceId;
newCall.opponentSessionId = content['sender_session_id'];
if (!delegate.canHandleNewCall &&
(confId == null || confId != currentGroupCID)) {
Logs().v(
'[VOIP] onCallInvite: canRespondNewCalls is false, maybe user is busy.');
await newCall.reject(reason: 'busy', shouldEmit: false);
delegate.handleMissedCall(newCall);
return;
}
final offer = RTCSessionDescription(
content['offer']['sdp'],
content['offer']['type'],
);
await newCall.initWithInvite(
callType, offer, sdpStreamMetadata, lifetime, confId != null);
@ -223,7 +233,9 @@ class VoIP {
///TODO: notify the callkeep that the call is incoming.
}
// Play ringtone
delegate.playRingtone();
if (confId == null) {
delegate.playRingtone();
}
}
Future<void> onCallAnswer(