Skip to content

Display and control your Android device

Refactor DeviceMessageSender

Romain Vimont021c5d371ad0
diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
index d757d577..b925dd80 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -413,7 +413,8 @@ public class Controller implements AsyncProcessor {
if (!clipboardAutosync) {
String clipboardText = Device.getClipboardText();
if (clipboardText != null) {
- sender.pushClipboardText(clipboardText);
+ DeviceMessage msg = DeviceMessage.createClipboard(clipboardText);
+ sender.send(msg);
}
}
}
@@ -431,7 +432,8 @@ public class Controller implements AsyncProcessor {
if (sequence != ControlMessage.SEQUENCE_INVALID) {
// Acknowledgement requested
- sender.pushAckClipboard(sequence);
+ DeviceMessage msg = DeviceMessage.createAckClipboard(sequence);
+ sender.send(msg);
}
return ok;
diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java b/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java
index 5b7c4de5..2e333e3f 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java
@@ -5,8 +5,6 @@ public final class DeviceMessage {
public static final int TYPE_CLIPBOARD = 0;
public static final int TYPE_ACK_CLIPBOARD = 1;
- public static final long SEQUENCE_INVALID = ControlMessage.SEQUENCE_INVALID;
-
private int type;
private String text;
private long sequence;
diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java b/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
index efb7b975..af14bb4e 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
@@ -1,54 +1,30 @@
package com.genymobile.scrcpy;
import java.io.IOException;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
public final class DeviceMessageSender {
private final ControlChannel controlChannel;
private Thread thread;
-
- private String clipboardText;
-
- private long ack;
+ private final BlockingQueue<DeviceMessage> queue = new ArrayBlockingQueue<>(16);
public DeviceMessageSender(ControlChannel controlChannel) {
this.controlChannel = controlChannel;
}
- public synchronized void pushClipboardText(String text) {
- clipboardText = text;
- notify();
- }
-
- public synchronized void pushAckClipboard(long sequence) {
- ack = sequence;
- notify();
+ public void send(DeviceMessage msg) {
+ if (!queue.offer(msg)) {
+ Ln.w("Device message dropped: " + msg.getType());
+ }
}
private void loop() throws IOException, InterruptedException {
while (!Thread.currentThread().isInterrupted()) {
- String text;
- long sequence;
- synchronized (this) {
- while (ack == DeviceMessage.SEQUENCE_INVALID && clipboardText == null) {
- wait();
- }
- text = clipboardText;
- clipboardText = null;
-
- sequence = ack;
- ack = DeviceMessage.SEQUENCE_INVALID;
- }
-
- if (sequence != DeviceMessage.SEQUENCE_INVALID) {
- DeviceMessage event = DeviceMessage.createAckClipboard(sequence);
- controlChannel.send(event);
- }
- if (text != null) {
- DeviceMessage event = DeviceMessage.createClipboard(text);
- controlChannel.send(event);
- }
+ DeviceMessage msg = queue.take();
+ controlChannel.send(msg);
}
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index 3936648d..587a46df 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -133,7 +133,10 @@ public final class Server {
if (control) {
ControlChannel controlChannel = connection.getControlChannel();
Controller controller = new Controller(device, controlChannel, cleanUp, options.getClipboardAutosync(), options.getPowerOn());
- device.setClipboardListener(text -> controller.getSender().pushClipboardText(text));
+ device.setClipboardListener(text -> {
+ DeviceMessage msg = DeviceMessage.createClipboard(text);
+ controller.getSender().send(msg);
+ });
asyncProcessors.add(controller);
}