From 075ba20cf926577d849daf22f79b640c7eeaed67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Mon, 17 Oct 2022 10:34:43 +0200
Subject: [PATCH] Split handling of "unshareScreen" and WebRTC messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
---
 .../nextcloud/talk/activities/CallActivity.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 78c21dec4..25e50d6db 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -1666,6 +1666,12 @@ public class CallActivity extends CallBaseActivity {
         if ("video".equals(ncSignalingMessage.getRoomType()) || "screen".equals(ncSignalingMessage.getRoomType())) {
             String type = ncSignalingMessage.getType();
 
+            if ("unshareScreen".equals(type)) {
+                endPeerConnection(ncSignalingMessage.getFrom(), true);
+
+                return;
+            }
+
             PeerConnectionWrapper peerConnectionWrapper = null;
 
             if ("offer".equals(type)) {
@@ -1678,16 +1684,12 @@ public class CallActivity extends CallBaseActivity {
                                                                 ncSignalingMessage.getRoomType());
             }
 
-            if ("unshareScreen".equals(type) ||
-                (("offer".equals(type) ||
+            if (("offer".equals(type) ||
                     "answer".equals(type) ||
                     "candidate".equals(type) ||
                     "endOfCandidates".equals(type)) &&
-                    peerConnectionWrapper != null)) {
+                    peerConnectionWrapper != null) {
                 switch (type) {
-                    case "unshareScreen":
-                        endPeerConnection(ncSignalingMessage.getFrom(), true);
-                        break;
                     case "offer":
                     case "answer":
                         peerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick());