Display and control your Android device
Move acknowledgment handling
Romain Vimontdc19ae334dcc
diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.javaindex 8b24b300..b52d413e 100644--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java@@ -120,12 +120,7 @@ public class Controller {}break;case ControlMessage.TYPE_SET_CLIPBOARD:- long sequence = msg.getSequence();- setClipboard(msg.getText(), msg.getPaste());- if (sequence != ControlMessage.SEQUENCE_INVALID) {- // Acknowledgement requested- sender.pushAckClipboard(sequence);- }+ setClipboard(msg.getText(), msg.getPaste(), msg.getSequence());break;case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:if (device.supportsInputEvents()) {@@ -281,7 +276,7 @@ public class Controller {return device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER);}- private boolean setClipboard(String text, boolean paste) {+ private boolean setClipboard(String text, boolean paste, long sequence) {boolean ok = device.setClipboardText(text);if (ok) {Ln.i("Device clipboard set");@@ -292,6 +287,11 @@ public class Controller {device.pressReleaseKeycode(KeyEvent.KEYCODE_PASTE);}+ if (sequence != ControlMessage.SEQUENCE_INVALID) {+ // Acknowledgement requested+ sender.pushAckClipboard(sequence);+ }+return ok;}}