conference: use SFU device ID on SelectAnswer

Author: daniel-abramov

pkg/conference/matrix.go

@@ -106,12 +106,12 @@ func (c *Conference) onSelectAnswer(participantID ParticipantID, ev *event.CallS
 	if participant := c.getParticipant(participantID, nil); participant != nil {
 		participant.logger.Info("Received remote answer selection")
 
-		if ev.SelectedPartyID != participantID.DeviceID.String() {
+		if ev.SelectedPartyID != string(c.signaling.DeviceID()) {
 			c.logger.WithFields(logrus.Fields{
 				"device_id": ev.SelectedPartyID,
 				"user_id":   participantID,
 			}).Errorf("Call was answered on a different device, kicking this peer")
-			participant.peer.Terminate()
+			c.removeParticipant(participantID)
 		}
 	}
 }

pkg/signaling/matrix.go

@@ -55,6 +55,7 @@ type MatrixSignaling interface {
 	SendICECandidates(recipient MatrixRecipient, candidates []event.CallCandidate)
 	SendCandidatesGatheringFinished(recipient MatrixRecipient)
 	SendHangup(recipient MatrixRecipient, reason event.CallHangupReason)
+	DeviceID() id.DeviceID
 }
 
 func (m *MatrixForConference) SendSDPAnswer(
@@ -109,6 +110,10 @@ func (m *MatrixForConference) SendHangup(recipient MatrixRecipient, reason event
 	m.sendToDevice(recipient, event.CallHangup, eventContent)
 }
 
+func (m *MatrixForConference) DeviceID() id.DeviceID {
+	return m.client.DeviceID
+}
+
 func (m *MatrixForConference) createBaseEventContent(
 	callID string,
 	destSessionID id.SessionID,