From 20c3dd3ec76da595f22559084213be2e04f818fb Mon Sep 17 00:00:00 2001 From: Chanhee Lee Date: Fri, 17 Feb 2023 09:59:50 +0900 Subject: [PATCH] Remove Android Studio warnings in Android AITT code [Problem] Some warnings are shown in Android Studio. [Solution] Resolve warnings for clean code --- .../src/main/java/com/samsung/android/aitt/stream/RTSPStream.java | 2 -- .../java/com/samsung/android/modules/tcp/TCPInstrumentedTest.java | 2 -- .../com/samsung/android/modules/webrtc/WebRTCInstrumentedTest.java | 6 +++--- .../java/com/samsung/android/modules/webrtc/WebRTCSubscriber.java | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/android/aitt/src/main/java/com/samsung/android/aitt/stream/RTSPStream.java b/android/aitt/src/main/java/com/samsung/android/aitt/stream/RTSPStream.java index 92d82e4..072bfd3 100644 --- a/android/aitt/src/main/java/com/samsung/android/aitt/stream/RTSPStream.java +++ b/android/aitt/src/main/java/com/samsung/android/aitt/stream/RTSPStream.java @@ -24,8 +24,6 @@ import com.samsung.android.aittnative.JniInterface; import com.samsung.android.modules.rtsp.RTSPClient; import java.nio.ByteBuffer; -import java.util.HashMap; -import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; /** diff --git a/android/modules/tcp/src/androidTest/java/com/samsung/android/modules/tcp/TCPInstrumentedTest.java b/android/modules/tcp/src/androidTest/java/com/samsung/android/modules/tcp/TCPInstrumentedTest.java index 1a3f69b..44be85d 100644 --- a/android/modules/tcp/src/androidTest/java/com/samsung/android/modules/tcp/TCPInstrumentedTest.java +++ b/android/modules/tcp/src/androidTest/java/com/samsung/android/modules/tcp/TCPInstrumentedTest.java @@ -4,8 +4,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; -import static java.lang.Thread.sleep; - import android.content.Context; import android.net.ConnectivityManager; import android.net.LinkAddress; diff --git a/android/modules/webrtc/src/androidTest/java/com/samsung/android/modules/webrtc/WebRTCInstrumentedTest.java b/android/modules/webrtc/src/androidTest/java/com/samsung/android/modules/webrtc/WebRTCInstrumentedTest.java index ab9ae71..5161f59 100644 --- a/android/modules/webrtc/src/androidTest/java/com/samsung/android/modules/webrtc/WebRTCInstrumentedTest.java +++ b/android/modules/webrtc/src/androidTest/java/com/samsung/android/modules/webrtc/WebRTCInstrumentedTest.java @@ -122,7 +122,7 @@ public class WebRTCInstrumentedTest { AittStream serverSubscriberStream = serverSubscriber.createStream(Aitt.Protocol.WEBRTC, TEST_MESSAGE_TOPIC, SUBSCRIBER); serverSubscriberStream.setReceiveCallback(data -> { Log.i(TAG, "A callback is received in testWebRTCBasicMessageStreaming. Message size = " + data.length); - if (Arrays.equals(data, message.getBytes()) == false) + if (!Arrays.equals(data, message.getBytes())) throw new RuntimeException("A wrong test message(" + new String(data) + ") is received."); Log.i(TAG, "The correct test message(" + new String(data) + ") is received."); @@ -176,7 +176,7 @@ public class WebRTCInstrumentedTest { AittStream serverSubscriberStream = serverSubscriber.createStream(Aitt.Protocol.WEBRTC, TEST_LARGE_MESSAGE_TOPIC, SUBSCRIBER); serverSubscriberStream.setReceiveCallback(data -> { Log.i(TAG, "A callback is received in testWebRTCSendLargeMessage. Message size = " + data.length); - if (Arrays.equals(data, largeBytes) == false) { + if (!Arrays.equals(data, largeBytes)) { throw new RuntimeException("A wrong large message is received."); } Log.i(TAG, "The correct large message is received. size = " + data.length); @@ -229,7 +229,7 @@ public class WebRTCInstrumentedTest { AittStream serverSubscriberStream = serverSubscriber.createStream(Aitt.Protocol.WEBRTC, TEST_VIDEO_TOPIC, SUBSCRIBER); serverSubscriberStream.setReceiveCallback(data -> { Log.i(TAG, "A callback is received in testWebRTCBasicVideoStreaming."); - if (Arrays.equals(data, frameImageBytes) == false) + if (!Arrays.equals(data, frameImageBytes)) throw new RuntimeException("A wrong test image is received."); Log.i(TAG, "The correct test image is received."); diff --git a/android/modules/webrtc/src/main/java/com/samsung/android/modules/webrtc/WebRTCSubscriber.java b/android/modules/webrtc/src/main/java/com/samsung/android/modules/webrtc/WebRTCSubscriber.java index 9dbe3f0..e714a4c 100644 --- a/android/modules/webrtc/src/main/java/com/samsung/android/modules/webrtc/WebRTCSubscriber.java +++ b/android/modules/webrtc/src/main/java/com/samsung/android/modules/webrtc/WebRTCSubscriber.java @@ -48,7 +48,7 @@ public final class WebRTCSubscriber extends WebRTC { private static final String TAG = "WebRTCSubscriber"; - private ByteArrayOutputStream baos; + private final ByteArrayOutputStream baos; private boolean recvLargeChunk = false; public WebRTCSubscriber(Context appContext) throws InstantiationException { -- 2.7.4