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

Merge pull request #1940 from nextcloud/fix-trying-to-establish-a-connection-before-a-participant-joins-the-call

Browse Source 
Fix trying to establish a connection before a participant joins the call
This commit is contained in:
Tim Krueger 2022-04-22 17:16:08 +02:00 committed by GitHub
commit f7dcf58d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1543,10 +1543,6 @@ public class CallActivity extends CallBaseActivity {
private void processMessage(NCSignalingMessage ncSignalingMessage) { private void processMessage(NCSignalingMessage ncSignalingMessage) {
if (ncSignalingMessage.getRoomType().equals("video") || ncSignalingMessage.getRoomType().equals("screen")) { if (ncSignalingMessage.getRoomType().equals("video") || ncSignalingMessage.getRoomType().equals("screen")) {
PeerConnectionWrapper peerConnectionWrapper =
getPeerConnectionWrapperForSessionIdAndType(ncSignalingMessage.getFrom(),
ncSignalingMessage.getRoomType(), false);
String type = null; String type = null;
if (ncSignalingMessage.getPayload() != null && ncSignalingMessage.getPayload().getType() != null) { if (ncSignalingMessage.getPayload() != null && ncSignalingMessage.getPayload().getType() != null) {
type = ncSignalingMessage.getPayload().getType(); type = ncSignalingMessage.getPayload().getType();
@ -1554,7 +1550,24 @@ public class CallActivity extends CallBaseActivity {
type = ncSignalingMessage.getType(); type = ncSignalingMessage.getType();
} }
if (type != null) { PeerConnectionWrapper peerConnectionWrapper = null;
if ("offer".equals(type)) {
peerConnectionWrapper =
getOrCreatePeerConnectionWrapperForSessionIdAndType(ncSignalingMessage.getFrom(),
ncSignalingMessage.getRoomType(), false);
} else {
peerConnectionWrapper =
getPeerConnectionWrapperForSessionIdAndType(ncSignalingMessage.getFrom(),
ncSignalingMessage.getRoomType());
}
if ("unshareScreen".equals(type) ||
(("offer".equals(type) ||
"answer".equals(type) ||
"candidate".equals(type) ||
"endOfCandidates".equals(type)) &&
peerConnectionWrapper != null)) {
switch (type) { switch (type) {
case "unshareScreen": case "unshareScreen":
endPeerConnection(ncSignalingMessage.getFrom(), true); endPeerConnection(ncSignalingMessage.getFrom(), true);
@ -1765,12 +1778,12 @@ public class CallActivity extends CallBaseActivity {
if (hasMCU) { if (hasMCU) {
// Ensure that own publishing peer is set up. // Ensure that own publishing peer is set up.
getPeerConnectionWrapperForSessionIdAndType(webSocketClient.getSessionId(), VIDEO_STREAM_TYPE_VIDEO, true); getOrCreatePeerConnectionWrapperForSessionIdAndType(webSocketClient.getSessionId(), VIDEO_STREAM_TYPE_VIDEO, true);
} }
for (String sessionId : newSessions) { for (String sessionId : newSessions) {
Log.d(TAG, " newSession joined: " + sessionId); Log.d(TAG, " newSession joined: " + sessionId);
getPeerConnectionWrapperForSessionIdAndType(sessionId, VIDEO_STREAM_TYPE_VIDEO, false); getOrCreatePeerConnectionWrapperForSessionIdAndType(sessionId, VIDEO_STREAM_TYPE_VIDEO, false);
} }
if (newSessions.size() > 0 && !currentCallStatus.equals(CallStatus.IN_CONVERSATION)) { if (newSessions.size() > 0 && !currentCallStatus.equals(CallStatus.IN_CONVERSATION)) {
@ -1825,7 +1838,7 @@ public class CallActivity extends CallBaseActivity {
peerConnectionWrapperList.remove(peerConnectionWrapper); peerConnectionWrapperList.remove(peerConnectionWrapper);
} }
private PeerConnectionWrapper getPeerConnectionWrapperForSessionId(String sessionId, String type) { private PeerConnectionWrapper getPeerConnectionWrapperForSessionIdAndType(String sessionId, String type) {
for (int i = 0; i < peerConnectionWrapperList.size(); i++) { for (int i = 0; i < peerConnectionWrapperList.size(); i++) {
if (peerConnectionWrapperList.get(i).getSessionId().equals(sessionId) if (peerConnectionWrapperList.get(i).getSessionId().equals(sessionId)
&& peerConnectionWrapperList.get(i).getVideoStreamType().equals(type)) { && peerConnectionWrapperList.get(i).getVideoStreamType().equals(type)) {
@ -1836,11 +1849,11 @@ public class CallActivity extends CallBaseActivity {
return null; return null;
} }
private PeerConnectionWrapper getPeerConnectionWrapperForSessionIdAndType(String sessionId, private PeerConnectionWrapper getOrCreatePeerConnectionWrapperForSessionIdAndType(String sessionId,
String type, String type,
boolean publisher) { boolean publisher) {
PeerConnectionWrapper peerConnectionWrapper; PeerConnectionWrapper peerConnectionWrapper;
if ((peerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId, type)) != null) { if ((peerConnectionWrapper = getPeerConnectionWrapperForSessionIdAndType(sessionId, type)) != null) {
return peerConnectionWrapper; return peerConnectionWrapper;
} else { } else {
if (hasMCU && publisher) { if (hasMCU && publisher) {
@ -2181,7 +2194,9 @@ public class CallActivity extends CallBaseActivity {
if (hasExternalSignalingServer) { if (hasExternalSignalingServer) {
nick = webSocketClient.getDisplayNameForSession(session); nick = webSocketClient.getDisplayNameForSession(session);
} else { } else {
nick = getPeerConnectionWrapperForSessionIdAndType(session, videoStreamType, false).getNick(); PeerConnectionWrapper peerConnectionWrapper = getPeerConnectionWrapperForSessionIdAndType(session,
videoStreamType);
nick = peerConnectionWrapper != null ? peerConnectionWrapper.getNick() : "";
} }
String userId = ""; String userId = "";