From 34498efa72c0b97936f0cda408f965e1dc66aca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Wed, 23 Nov 2022 12:40:01 +0100
Subject: [PATCH] Rewrite if/else chain as if/return blocks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just a matter of preference :-)

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
---
 .../talk/activities/CallActivity.java         | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 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 8acd14b52..9b2d71eb6 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -2704,13 +2704,25 @@ public class CallActivity extends CallBaseActivity {
                 if (iceConnectionState == PeerConnection.IceConnectionState.CONNECTED ||
                         iceConnectionState == PeerConnection.IceConnectionState.COMPLETED) {
                     handlePeerConnected(sessionId, videoStreamType);
-                } else if (iceConnectionState == PeerConnection.IceConnectionState.DISCONNECTED ||
+
+                    return;
+                }
+
+                if (iceConnectionState == PeerConnection.IceConnectionState.DISCONNECTED ||
                         iceConnectionState == PeerConnection.IceConnectionState.NEW ||
                         iceConnectionState == PeerConnection.IceConnectionState.CHECKING) {
                     handlePeerDisconnected(sessionId, videoStreamType);
-                } else if (iceConnectionState == PeerConnection.IceConnectionState.CLOSED) {
+
+                    return;
+                }
+
+                if (iceConnectionState == PeerConnection.IceConnectionState.CLOSED) {
                     endPeerConnection(sessionId, VIDEO_STREAM_TYPE_SCREEN.equals(videoStreamType));
-                } else if (iceConnectionState == PeerConnection.IceConnectionState.FAILED) {
+
+                    return;
+                }
+
+                if (iceConnectionState == PeerConnection.IceConnectionState.FAILED) {
                     if (webSocketClient != null && webSocketClient.getSessionId() != null && webSocketClient.getSessionId().equals(sessionId)) {
                         setCallState(CallStatus.PUBLISHER_FAILED);
                         webSocketClient.clearResumeId();
@@ -2718,6 +2730,8 @@ public class CallActivity extends CallBaseActivity {
                     } else {
                         handlePeerDisconnected(sessionId, videoStreamType);
                     }
+
+                    return;
                 }
             });
         }