From eabaf6f7bd391d0147eaebda51c79bbf9a75807a Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 17 Jul 2020 00:00:42 +0200
Subject: [PATCH] Simplify PASTE option for "set clipboard"

When the client requests to set the clipboard, it may request to press
the PASTE key in addition. To be a bit generic, it was stored as a flag
in ControlMessage.java.

But flags suggest that it represents a bitwise union. Use a simple
boolean instead.
---
 .../java/com/genymobile/scrcpy/ControlMessage.java   | 12 ++++--------
 .../com/genymobile/scrcpy/ControlMessageReader.java  |  4 ++--
 .../main/java/com/genymobile/scrcpy/Controller.java  |  3 +--
 .../genymobile/scrcpy/ControlMessageReaderTest.java  |  8 ++------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
index dbb8d382..736acf80 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@@ -17,8 +17,6 @@ public final class ControlMessage {
     public static final int TYPE_SET_SCREEN_POWER_MODE = 9;
     public static final int TYPE_ROTATE_DEVICE = 10;
 
-    public static final int FLAGS_PASTE = 1;
-
     private int type;
     private String text;
     private int metaState; // KeyEvent.META_*
@@ -30,7 +28,7 @@ public final class ControlMessage {
     private Position position;
     private int hScroll;
     private int vScroll;
-    private int flags;
+    private boolean paste;
     private int repeat;
 
     private ControlMessage() {
@@ -77,9 +75,7 @@ public final class ControlMessage {
         ControlMessage msg = new ControlMessage();
         msg.type = TYPE_SET_CLIPBOARD;
         msg.text = text;
-        if (paste) {
-            msg.flags = FLAGS_PASTE;
-        }
+        msg.paste = paste;
         return msg;
     }
 
@@ -143,8 +139,8 @@ public final class ControlMessage {
         return vScroll;
     }
 
-    public int getFlags() {
-        return flags;
+    public boolean getPaste() {
+        return paste;
     }
 
     public int getRepeat() {
diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
index 132e3f4e..ce185103 100644
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@@ -154,12 +154,12 @@ public class ControlMessageReader {
         if (buffer.remaining() < SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH) {
             return null;
         }
-        boolean parse = buffer.get() != 0;
+        boolean paste = buffer.get() != 0;
         String text = parseString();
         if (text == null) {
             return null;
         }
-        return ControlMessage.createSetClipboard(text, parse);
+        return ControlMessage.createSetClipboard(text, paste);
     }
 
     private ControlMessage parseSetScreenPowerMode() {
diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
index 6ff8d208..f32e5ec0 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -110,8 +110,7 @@ public class Controller {
                 }
                 break;
             case ControlMessage.TYPE_SET_CLIPBOARD:
-                boolean paste = (msg.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
-                setClipboard(msg.getText(), paste);
+                setClipboard(msg.getText(), msg.getPaste());
                 break;
             case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
                 if (device.supportsInputEvents()) {
diff --git a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
index 1e2b8266..5eb52760 100644
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@@ -230,9 +230,7 @@ public class ControlMessageReaderTest {
 
         Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
         Assert.assertEquals("testé", event.getText());
-
-        boolean parse = (event.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
-        Assert.assertTrue(parse);
+        Assert.assertTrue(event.getPaste());
     }
 
     @Test
@@ -258,9 +256,7 @@ public class ControlMessageReaderTest {
 
         Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
         Assert.assertEquals(text, event.getText());
-
-        boolean parse = (event.getFlags() & ControlMessage.FLAGS_PASTE) != 0;
-        Assert.assertTrue(parse);
+        Assert.assertTrue(event.getPaste());
     }
 
     @Test