From af514b142a1ec62c3a514eabde4bbe0135f04b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Mon, 7 Nov 2022 01:36:02 +0100 Subject: [PATCH] Reorder code that handles nick changed events MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- .../talk/webrtc/PeerConnectionWrapper.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java index 944bbf8f8..18371cf95 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java @@ -324,15 +324,17 @@ public class PeerConnectionWrapper { DataChannelMessage dataChannelMessage = LoganSquare.parse(strData, DataChannelMessage.class); if ("nickChanged".equals(dataChannelMessage.getType())) { + String nick = null; if (dataChannelMessage.getPayload() instanceof String) { + nick = (String) dataChannelMessage.getPayload(); + } else if (dataChannelMessage.getPayload() instanceof Map) { + Map payloadMap = (Map) dataChannelMessage.getPayload(); + nick = payloadMap.get("name"); + } + + if (nick != null) { EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType - .NICK_CHANGE, sessionId, (String) dataChannelMessage.getPayload(), null, videoStreamType)); - } else { - if (dataChannelMessage.getPayload() != null) { - Map payloadMap = (Map) dataChannelMessage.getPayload(); - EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType - .NICK_CHANGE, sessionId, payloadMap.get("name"), null, videoStreamType)); - } + .NICK_CHANGE, sessionId, nick, null, videoStreamType)); } } else if ("audioOn".equals(dataChannelMessage.getType())) { EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType