gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-02-08 07:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split handling of "unshareScreen" and WebRTC messages

Browse Source 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2022-10-17 10:34:43 +02:00
parent 7b1bfb2c17
commit 075ba20cf9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1666,6 +1666,12 @@ public class CallActivity extends CallBaseActivity {
if ("video".equals(ncSignalingMessage.getRoomType()) || "screen".equals(ncSignalingMessage.getRoomType())) { if ("video".equals(ncSignalingMessage.getRoomType()) || "screen".equals(ncSignalingMessage.getRoomType())) {
String type = ncSignalingMessage.getType(); String type = ncSignalingMessage.getType();
if ("unshareScreen".equals(type)) {
endPeerConnection(ncSignalingMessage.getFrom(), true);
return;
}
PeerConnectionWrapper peerConnectionWrapper = null; PeerConnectionWrapper peerConnectionWrapper = null;
if ("offer".equals(type)) { if ("offer".equals(type)) {
@ -1678,16 +1684,12 @@ public class CallActivity extends CallBaseActivity {
ncSignalingMessage.getRoomType()); ncSignalingMessage.getRoomType());
} }
if ("unshareScreen".equals(type) || if (("offer".equals(type) ||
(("offer".equals(type) ||
"answer".equals(type) || "answer".equals(type) ||
"candidate".equals(type) || "candidate".equals(type) ||
"endOfCandidates".equals(type)) && "endOfCandidates".equals(type)) &&
peerConnectionWrapper != null)) { peerConnectionWrapper != null) {
switch (type) { switch (type) {
case "unshareScreen":
endPeerConnection(ncSignalingMessage.getFrom(), true);
break;
case "offer": case "offer":
case "answer": case "answer":
peerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick()); peerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick());