From ac4be52b843387faa63a1ac62a6d03a2f4d8c86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Mon, 7 Nov 2022 01:39:11 +0100
Subject: [PATCH] Do not guard code that can not throw the caught exception
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>
---
 .../talk/webrtc/PeerConnectionWrapper.java    | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 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 18371cf95..e3452f7aa 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
@@ -320,37 +320,40 @@ public class PeerConnectionWrapper {
             String strData = new String(bytes);
             Log.d(TAG, "Got msg: " + strData + " over " + TAG + " " + sessionId);
 
+            DataChannelMessage dataChannelMessage;
             try {
-                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<String, String> payloadMap = (Map<String, String>) dataChannelMessage.getPayload();
-                        nick = payloadMap.get("name");
-                    }
-
-                    if (nick != null) {
-                        EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                                .NICK_CHANGE, sessionId, nick, null, videoStreamType));
-                    }
-                } else if ("audioOn".equals(dataChannelMessage.getType())) {
-                    EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                            .AUDIO_CHANGE, sessionId, null, TRUE, videoStreamType));
-                } else if ("audioOff".equals(dataChannelMessage.getType())) {
-                    EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                            .AUDIO_CHANGE, sessionId, null, FALSE, videoStreamType));
-                } else if ("videoOn".equals(dataChannelMessage.getType())) {
-                    EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                            .VIDEO_CHANGE, sessionId, null, TRUE, videoStreamType));
-                } else if ("videoOff".equals(dataChannelMessage.getType())) {
-                    EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                            .VIDEO_CHANGE, sessionId, null, FALSE, videoStreamType));
-                }
+                dataChannelMessage = LoganSquare.parse(strData, DataChannelMessage.class);
             } catch (IOException e) {
                 Log.d(TAG, "Failed to parse data channel message");
+
+                return;
+            }
+
+            if ("nickChanged".equals(dataChannelMessage.getType())) {
+                String nick = null;
+                if (dataChannelMessage.getPayload() instanceof String) {
+                    nick = (String) dataChannelMessage.getPayload();
+                } else if (dataChannelMessage.getPayload() instanceof Map) {
+                    Map<String, String> payloadMap = (Map<String, String>) dataChannelMessage.getPayload();
+                    nick = payloadMap.get("name");
+                }
+
+                if (nick != null) {
+                    EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
+                            .NICK_CHANGE, sessionId, nick, null, videoStreamType));
+                }
+            } else if ("audioOn".equals(dataChannelMessage.getType())) {
+                EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
+                        .AUDIO_CHANGE, sessionId, null, TRUE, videoStreamType));
+            } else if ("audioOff".equals(dataChannelMessage.getType())) {
+                EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
+                        .AUDIO_CHANGE, sessionId, null, FALSE, videoStreamType));
+            } else if ("videoOn".equals(dataChannelMessage.getType())) {
+                EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
+                        .VIDEO_CHANGE, sessionId, null, TRUE, videoStreamType));
+            } else if ("videoOff".equals(dataChannelMessage.getType())) {
+                EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
+                        .VIDEO_CHANGE, sessionId, null, FALSE, videoStreamType));
             }
         }
     }