Browse Source

Use comparison operator rather than equals for enums in CallActivity

Fixes SPP_EQUALS_ON_ENUM issue from SpotBugs.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez 2 years ago
parent
commit
74cf2c7a41
1 changed files with 16 additions and 16 deletions
  1. 16 16
      app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

+ 16 - 16
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

@@ -440,7 +440,7 @@ public class CallActivity extends CallBaseActivity {
         binding.gridview.setOnItemClickListener((parent, view, position, id) -> animateCallControls(true, 0));
 
         binding.callStates.callStateRelativeLayout.setOnClickListener(l -> {
-            if (currentCallStatus.equals(CallStatus.CALLING_TIMEOUT)) {
+            if (currentCallStatus == CallStatus.CALLING_TIMEOUT) {
                 setCallState(CallStatus.RECONNECTING);
                 hangupNetworkCalls(false);
             }
@@ -747,7 +747,7 @@ public class CallActivity extends CallBaseActivity {
     }
 
     private boolean isConnectionEstablished() {
-        return (currentCallStatus.equals(CallStatus.JOINED) || currentCallStatus.equals(CallStatus.IN_CONVERSATION));
+        return (currentCallStatus == CallStatus.JOINED || currentCallStatus == CallStatus.IN_CONVERSATION);
     }
 
     @AfterPermissionGranted(100)
@@ -838,9 +838,9 @@ public class CallActivity extends CallBaseActivity {
         Log.d(TAG, "onAudioManagerDevicesChanged: " + availableDevices + ", "
             + "currentDevice: " + currentDevice);
 
-        final boolean shouldDisableProximityLock = (currentDevice.equals(WebRtcAudioManager.AudioDevice.WIRED_HEADSET)
-            || currentDevice.equals(WebRtcAudioManager.AudioDevice.SPEAKER_PHONE)
-            || currentDevice.equals(WebRtcAudioManager.AudioDevice.BLUETOOTH));
+        final boolean shouldDisableProximityLock = (currentDevice == WebRtcAudioManager.AudioDevice.WIRED_HEADSET
+            || currentDevice == WebRtcAudioManager.AudioDevice.SPEAKER_PHONE
+            || currentDevice == WebRtcAudioManager.AudioDevice.BLUETOOTH);
 
         if (shouldDisableProximityLock) {
             powerManagerUtils.updatePhoneState(PowerManagerUtils.PhoneState.WITHOUT_PROXIMITY_SENSOR_LOCK);
@@ -1230,7 +1230,7 @@ public class CallActivity extends CallBaseActivity {
             Log.d(TAG, "localStream is null");
         }
 
-        if (!currentCallStatus.equals(CallStatus.LEAVING)) {
+        if (currentCallStatus != CallStatus.LEAVING) {
             hangup(true);
         }
         powerManagerUtils.updatePhoneState(PowerManagerUtils.PhoneState.IDLE);
@@ -1457,7 +1457,7 @@ public class CallActivity extends CallBaseActivity {
 
                 @Override
                 public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
-                    if (!currentCallStatus.equals(CallStatus.LEAVING)) {
+                    if (currentCallStatus != CallStatus.LEAVING) {
                         setCallState(CallStatus.JOINED);
 
                         ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
@@ -1549,7 +1549,7 @@ public class CallActivity extends CallBaseActivity {
                 conversationUser, externalSignalingServer.getExternalSignalingTicket(),
                 TextUtils.isEmpty(credentials));
         } else {
-            if (webSocketClient.isConnected() && currentCallStatus.equals(CallStatus.PUBLISHER_FAILED)) {
+            if (webSocketClient.isConnected() && currentCallStatus == CallStatus.PUBLISHER_FAILED) {
                 webSocketClient.restartWebSocket();
             }
         }
@@ -1567,7 +1567,7 @@ public class CallActivity extends CallBaseActivity {
 
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     public void onMessageEvent(WebSocketCommunicationEvent webSocketCommunicationEvent) {
-        if (CallStatus.LEAVING.equals(currentCallStatus)) {
+        if (currentCallStatus == CallStatus.LEAVING) {
             return;
         }
 
@@ -1575,7 +1575,7 @@ public class CallActivity extends CallBaseActivity {
             case "hello":
                 Log.d(TAG, "onMessageEvent 'hello'");
                 if (!webSocketCommunicationEvent.getHashMap().containsKey("oldResumeId")) {
-                    if (currentCallStatus.equals(CallStatus.RECONNECTING)) {
+                    if (currentCallStatus == CallStatus.RECONNECTING) {
                         hangup(false);
                     } else {
                         initiateCall();
@@ -1660,7 +1660,7 @@ public class CallActivity extends CallBaseActivity {
     private void receivedSignalingMessage(Signaling signaling) throws IOException {
         String messageType = signaling.getType();
 
-        if (!isConnectionEstablished() && !currentCallStatus.equals(CallStatus.CONNECTING)) {
+        if (!isConnectionEstablished() && currentCallStatus != CallStatus.CONNECTING) {
             return;
         }
 
@@ -1889,7 +1889,7 @@ public class CallActivity extends CallBaseActivity {
                 userIdsBySessionId.put(participant.get("sessionId").toString(), userId);
             } else {
                 Log.d(TAG, "   inCallFlag of currentSessionId: " + inCallFlag);
-                if (inCallFlag == 0 && !CallStatus.LEAVING.equals(currentCallStatus) && ApplicationWideCurrentRoomHolder.getInstance().isInCall()) {
+                if (inCallFlag == 0 && currentCallStatus != CallStatus.LEAVING && ApplicationWideCurrentRoomHolder.getInstance().isInCall()) {
                     Log.d(TAG, "Most probably a moderator ended the call for all.");
                     hangup(true);
                 }
@@ -1909,7 +1909,7 @@ public class CallActivity extends CallBaseActivity {
         // Calculate sessions that join the call
         newSessions.removeAll(oldSessions);
 
-        if (!isConnectionEstablished() && !currentCallStatus.equals(CallStatus.CONNECTING)) {
+        if (!isConnectionEstablished() && currentCallStatus != CallStatus.CONNECTING) {
             return;
         }
 
@@ -1938,7 +1938,7 @@ public class CallActivity extends CallBaseActivity {
             });
         }
 
-        if (newSessions.size() > 0 && !currentCallStatus.equals(CallStatus.IN_CONVERSATION)) {
+        if (newSessions.size() > 0 && currentCallStatus != CallStatus.IN_CONVERSATION) {
             setCallState(CallStatus.IN_CONVERSATION);
         }
 
@@ -2192,7 +2192,7 @@ public class CallActivity extends CallBaseActivity {
                 boolean enableVideo = peerConnectionEvent.getPeerConnectionEventType() ==
                     PeerConnectionEvent.PeerConnectionEventType.SENSOR_FAR && videoOn;
                 if (EffortlessPermissions.hasPermissions(this, PERMISSIONS_CAMERA) &&
-                    (currentCallStatus.equals(CallStatus.CONNECTING) || isConnectionEstablished()) && videoOn
+                    (currentCallStatus == CallStatus.CONNECTING || isConnectionEstablished()) && videoOn
                     && enableVideo != localVideoTrack.enabled()) {
                     toggleMedia(enableVideo, true);
                 }
@@ -2415,7 +2415,7 @@ public class CallActivity extends CallBaseActivity {
     }
 
     private void setCallState(CallStatus callState) {
-        if (currentCallStatus == null || !currentCallStatus.equals(callState)) {
+        if (currentCallStatus == null || currentCallStatus != callState) {
             currentCallStatus = callState;
             if (handler == null) {
                 handler = new Handler(Looper.getMainLooper());