From d81729ba390228330df34680bdd668bf4d733f4b Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 16 Nov 2018 18:34:08 +0100
Subject: [PATCH] Always expect 5 parameters for the server

The client always sends all the arguments, so there is no need to check.
---
 .../java/com/genymobile/scrcpy/Server.java    | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index db15fb52..db06cedb 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -46,35 +46,24 @@ public final class Server {
 
     @SuppressWarnings("checkstyle:MagicNumber")
     private static Options createOptions(String... args) {
+        if (args.length != 5)
+            throw new IllegalArgumentException("Expecting 5 parameters");
+
         Options options = new Options();
-        if (args.length < 1) {
-            return options;
-        }
+
         int maxSize = Integer.parseInt(args[0]) & ~7; // multiple of 8
         options.setMaxSize(maxSize);
 
-        if (args.length < 2) {
-            return options;
-        }
         int bitRate = Integer.parseInt(args[1]);
         options.setBitRate(bitRate);
 
-        if (args.length < 3) {
-            return options;
-        }
         // use "adb forward" instead of "adb tunnel"? (so the server must listen)
         boolean tunnelForward = Boolean.parseBoolean(args[2]);
         options.setTunnelForward(tunnelForward);
 
-        if (args.length < 4) {
-            return options;
-        }
         Rect crop = parseCrop(args[3]);
         options.setCrop(crop);
 
-        if (args.length < 5) {
-            return options;
-        }
         boolean sendFrameMeta = Boolean.parseBoolean(args[4]);
         options.setSendFrameMeta(sendFrameMeta);