From 3fd68d337f9aab1b2ac9b52f9f663192e443220c Mon Sep 17 00:00:00 2001 From: Jano Svitok Date: Mon, 6 Aug 2018 13:26:37 +0200 Subject: [PATCH] Various small fixes found by IDEA inspection --- src/se/vidstige/jadb/HostConnectionCommand.java | 2 +- src/se/vidstige/jadb/managers/PackageManager.java | 2 +- src/se/vidstige/jadb/server/AdbProtocolHandler.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/se/vidstige/jadb/HostConnectionCommand.java b/src/se/vidstige/jadb/HostConnectionCommand.java index 78eeae2..6428269 100644 --- a/src/se/vidstige/jadb/HostConnectionCommand.java +++ b/src/se/vidstige/jadb/HostConnectionCommand.java @@ -61,7 +61,7 @@ public class HostConnectionCommand { private String extractError(String response) { int lastColon = response.lastIndexOf(':'); if (lastColon != -1) { - return response.substring(lastColon, response.length()); + return response.substring(lastColon); } else { return response; } diff --git a/src/se/vidstige/jadb/managers/PackageManager.java b/src/se/vidstige/jadb/managers/PackageManager.java index 40d0fde..d9a3262 100644 --- a/src/se/vidstige/jadb/managers/PackageManager.java +++ b/src/se/vidstige/jadb/managers/PackageManager.java @@ -55,7 +55,7 @@ public class PackageManager { arguments.add("install"); arguments.addAll(extraArguments); arguments.add(remote.getPath()); - InputStream s = device.executeShell("pm", arguments.toArray(new String[arguments.size()])); + InputStream s = device.executeShell("pm", arguments.toArray(new String[0])); String result = Stream.readAll(s, StandardCharsets.UTF_8); remove(remote); verifyOperation("install", apkFile.getName(), result); diff --git a/src/se/vidstige/jadb/server/AdbProtocolHandler.java b/src/se/vidstige/jadb/server/AdbProtocolHandler.java index 02f2469..fc71a13 100644 --- a/src/se/vidstige/jadb/server/AdbProtocolHandler.java +++ b/src/se/vidstige/jadb/server/AdbProtocolHandler.java @@ -41,6 +41,7 @@ class AdbProtocolHandler implements Runnable { DataInputStream input = new DataInputStream(socket.getInputStream()); DataOutputStream output = new DataOutputStream(socket.getOutputStream()) ) { + //noinspection StatementWithEmptyBody while (processCommand(input, output)) { // nothing to do here }