Display and control your Android device
Check client and server mismatch
Yu-Chen Linb963a3b9d56f
diff --git a/app/src/server.c b/app/src/server.cindex de61001f..b40b065b 100644--- a/app/src/server.c+++ b/app/src/server.c@@ -131,6 +131,7 @@ execute_server(struct server *server, const struct server_params *params) {#endif"/", // unused"com.genymobile.scrcpy.Server",+ SCRCPY_VERSION,max_size_string,bit_rate_string,server->tunnel_forward ? "true" : "false",diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex eba89bdb..ba44d07c 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -67,29 +67,39 @@ public final class Server {@SuppressWarnings("checkstyle:MagicNumber")private static Options createOptions(String... args) {- if (args.length != 6) {- throw new IllegalArgumentException("Expecting 6 parameters");+ if (args.length < 1) {+ throw new IllegalArgumentException("Missing client version");+ }++ String clientVersion = args[0];+ if (!clientVersion.equals(BuildConfig.VERSION_NAME)) {+ throw new IllegalArgumentException("The server version (" + clientVersion + ") does not match the client "+ + "(" + BuildConfig.VERSION_NAME + ")");+ }++ if (args.length != 7) {+ throw new IllegalArgumentException("Expecting 7 parameters");}Options options = new Options();- int maxSize = Integer.parseInt(args[0]) & ~7; // multiple of 8+ int maxSize = Integer.parseInt(args[1]) & ~7; // multiple of 8options.setMaxSize(maxSize);- int bitRate = Integer.parseInt(args[1]);+ int bitRate = Integer.parseInt(args[2]);options.setBitRate(bitRate);// use "adb forward" instead of "adb tunnel"? (so the server must listen)- boolean tunnelForward = Boolean.parseBoolean(args[2]);+ boolean tunnelForward = Boolean.parseBoolean(args[3]);options.setTunnelForward(tunnelForward);- Rect crop = parseCrop(args[3]);+ Rect crop = parseCrop(args[4]);options.setCrop(crop);- boolean sendFrameMeta = Boolean.parseBoolean(args[4]);+ boolean sendFrameMeta = Boolean.parseBoolean(args[5]);options.setSendFrameMeta(sendFrameMeta);- boolean control = Boolean.parseBoolean(args[5]);+ boolean control = Boolean.parseBoolean(args[6]);options.setControl(control);return options;