gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-12 15:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Create and destroy ParticipantDisplayItems based on call participants

Browse Source 
The ParticipantDisplayItems were created and destroyed based on the peer
connections. Now a ParticipantDisplayItem of "video" type is associated
to a call participant, while an additional item is created and destroyed
depending on the state of the screen peer connection of the call
participant.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2022-11-27 22:12:46 +01:00 committed by Marcel Hibbe (Rebase PR Action)
parent e17a999812
commit 534bbddc88
1 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -268,6 +268,10 @@ public class CallActivity extends CallBaseActivity {
private Map<String, CallParticipant> callParticipants = new HashMap<>(); private Map<String, CallParticipant> callParticipants = new HashMap<>();
private Map<String, ScreenParticipantDisplayItemManager> screenParticipantDisplayItemManagers = new HashMap<>();
private Handler screenParticipantDisplayItemManagersHandler = new Handler(Looper.getMainLooper());
private SignalingMessageReceiver.ParticipantListMessageListener participantListMessageListener = new SignalingMessageReceiver.ParticipantListMessageListener() { private SignalingMessageReceiver.ParticipantListMessageListener participantListMessageListener = new SignalingMessageReceiver.ParticipantListMessageListener() {
@Override @Override
@ -1988,6 +1992,17 @@ public class CallActivity extends CallBaseActivity {
signalingMessageReceiver.addListener(offerAnswerNickProvider.getVideoWebRtcMessageListener(), sessionId, "video"); signalingMessageReceiver.addListener(offerAnswerNickProvider.getVideoWebRtcMessageListener(), sessionId, "video");
signalingMessageReceiver.addListener(offerAnswerNickProvider.getScreenWebRtcMessageListener(), sessionId, "screen"); signalingMessageReceiver.addListener(offerAnswerNickProvider.getScreenWebRtcMessageListener(), sessionId, "screen");
} }
final CallParticipantModel callParticipantModel = callParticipant.getCallParticipantModel();
ScreenParticipantDisplayItemManager screenParticipantDisplayItemManager =
new ScreenParticipantDisplayItemManager(callParticipantModel);
screenParticipantDisplayItemManagers.put(sessionId, screenParticipantDisplayItemManager);
callParticipantModel.addObserver(screenParticipantDisplayItemManager, screenParticipantDisplayItemManagersHandler);
runOnUiThread(() -> {
addParticipantDisplayItem(callParticipantModel, "video");
});
} }
if ("screen".equals(type)) { if ("screen".equals(type)) {
@ -1995,12 +2010,6 @@ public class CallActivity extends CallBaseActivity {
} else { } else {
callParticipant.setPeerConnectionWrapper(peerConnectionWrapper); callParticipant.setPeerConnectionWrapper(peerConnectionWrapper);
} }
final CallParticipantModel callParticipantModel = callParticipant.getCallParticipantModel();
runOnUiThread(() -> {
addParticipantDisplayItem(callParticipantModel, type);
});
} }
if (publisher) { if (publisher) {
@ -2032,8 +2041,6 @@ public class CallActivity extends CallBaseActivity {
PeerConnectionWrapper.PeerConnectionObserver peerConnectionObserver = peerConnectionObservers.remove(sessionId + "-" + videoStreamType); PeerConnectionWrapper.PeerConnectionObserver peerConnectionObserver = peerConnectionObservers.remove(sessionId + "-" + videoStreamType);
peerConnectionWrapper.removeObserver(peerConnectionObserver); peerConnectionWrapper.removeObserver(peerConnectionObserver);
runOnUiThread(() -> removeParticipantDisplayItem(sessionId, videoStreamType));
CallParticipant callParticipant = callParticipants.get(sessionId); CallParticipant callParticipant = callParticipants.get(sessionId);
if (callParticipant != null) { if (callParticipant != null) {
if ("screen".equals(videoStreamType)) { if ("screen".equals(videoStreamType)) {
@ -2052,6 +2059,10 @@ public class CallActivity extends CallBaseActivity {
if (!justScreen) { if (!justScreen) {
CallParticipant callParticipant = callParticipants.remove(sessionId); CallParticipant callParticipant = callParticipants.remove(sessionId);
if (callParticipant != null) { if (callParticipant != null) {
ScreenParticipantDisplayItemManager screenParticipantDisplayItemManager =
screenParticipantDisplayItemManagers.remove(sessionId);
callParticipant.getCallParticipantModel().removeObserver(screenParticipantDisplayItemManager);
callParticipant.destroy(); callParticipant.destroy();
SignalingMessageReceiver.CallParticipantMessageListener listener = callParticipantMessageListeners.remove(sessionId); SignalingMessageReceiver.CallParticipantMessageListener listener = callParticipantMessageListeners.remove(sessionId);
@ -2062,6 +2073,8 @@ public class CallActivity extends CallBaseActivity {
signalingMessageReceiver.removeListener(offerAnswerNickProvider.getVideoWebRtcMessageListener()); signalingMessageReceiver.removeListener(offerAnswerNickProvider.getVideoWebRtcMessageListener());
signalingMessageReceiver.removeListener(offerAnswerNickProvider.getScreenWebRtcMessageListener()); signalingMessageReceiver.removeListener(offerAnswerNickProvider.getScreenWebRtcMessageListener());
} }
runOnUiThread(() -> removeParticipantDisplayItem(sessionId, "video"));
} }
} }
} }
@ -2594,6 +2607,30 @@ public class CallActivity extends CallBaseActivity {
} }
} }
private class ScreenParticipantDisplayItemManager implements CallParticipantModel.Observer {
private final CallParticipantModel callParticipantModel;
private ScreenParticipantDisplayItemManager(CallParticipantModel callParticipantModel) {
this.callParticipantModel = callParticipantModel;
}
@Override
public void onChange() {
String sessionId = callParticipantModel.getSessionId();
if (callParticipantModel.getScreenIceConnectionState() == null) {
removeParticipantDisplayItem(sessionId, "screen");
return;
}
boolean hasScreenParticipantDisplayItem = participantDisplayItems.get(sessionId + "-screen") != null;
if (!hasScreenParticipantDisplayItem) {
addParticipantDisplayItem(callParticipantModel, "screen");
}
}
}
private class InternalSignalingMessageSender implements SignalingMessageSender { private class InternalSignalingMessageSender implements SignalingMessageSender {
@Override @Override