From efdfe8350791a1366e43c702a6da8386c157fbb4 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Dec 2022 09:30:41 +0100 Subject: [PATCH] Spotbugs: remove NPE deference Signed-off-by: Andy Scherzinger --- .../talk/webrtc/MagicWebSocketInstance.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java index ce3e317d6..f8333d4c9 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java @@ -209,16 +209,19 @@ public class MagicWebSocketInstance extends WebSocketListener { private void processMessage(String text) throws IOException { CallOverallWebSocketMessage callOverallWebSocketMessage = LoganSquare.parse(text, CallOverallWebSocketMessage.class); - NCSignalingMessage ncSignalingMessage = callOverallWebSocketMessage - .getCallWebSocketMessage() - .getNcSignalingMessage(); - if (TextUtils.isEmpty(ncSignalingMessage.getFrom()) && - callOverallWebSocketMessage.getCallWebSocketMessage().getSenderWebSocketMessage() != null) { - ncSignalingMessage.setFrom( - callOverallWebSocketMessage.getCallWebSocketMessage().getSenderWebSocketMessage().getSessionId()); - } - signalingMessageReceiver.process(ncSignalingMessage); + if (callOverallWebSocketMessage.getCallWebSocketMessage() != null) { + NCSignalingMessage ncSignalingMessage = callOverallWebSocketMessage + .getCallWebSocketMessage() + .getNcSignalingMessage(); + if (ncSignalingMessage != null && TextUtils.isEmpty(ncSignalingMessage.getFrom()) && + callOverallWebSocketMessage.getCallWebSocketMessage().getSenderWebSocketMessage() != null) { + ncSignalingMessage.setFrom( + callOverallWebSocketMessage.getCallWebSocketMessage().getSenderWebSocketMessage().getSessionId()); + } + + signalingMessageReceiver.process(ncSignalingMessage); + } } private void processEventMessage(String text) throws IOException {