From 4d5b67cc8018753a02a786cd4ca27e38cad50d65 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Mon, 26 Feb 2024 10:20:01 +0100
Subject: [PATCH] Log controller handling errors

On close, the controller is expected to throw an IOException because the
socket is closed, so the exception was ignored.

However, message handling actions may also throw IOException, and they
must not be silently ignored.

PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>
---
 .../com/genymobile/scrcpy/Controller.java     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
index 73d6ad57..a3508c96 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -81,8 +81,9 @@ public class Controller implements AsyncProcessor {
             SystemClock.sleep(500);
         }
 
-        while (!Thread.currentThread().isInterrupted()) {
-            handleEvent();
+        boolean alive = true;
+        while (!Thread.currentThread().isInterrupted() && alive) {
+            alive = handleEvent();
         }
     }
 
@@ -92,7 +93,7 @@ public class Controller implements AsyncProcessor {
             try {
                 control();
             } catch (IOException e) {
-                // this is expected on close
+                Ln.e("Controller error", e);
             } finally {
                 Ln.d("Controller stopped");
                 listener.onTerminated(true);
@@ -122,8 +123,15 @@ public class Controller implements AsyncProcessor {
         return sender;
     }
 
-    private void handleEvent() throws IOException {
-        ControlMessage msg = controlChannel.recv();
+    private boolean handleEvent() throws IOException {
+        ControlMessage msg;
+        try {
+            msg = controlChannel.recv();
+        } catch (IOException e) {
+            // this is expected on close
+            return false;
+        }
+
         switch (msg.getType()) {
             case ControlMessage.TYPE_INJECT_KEYCODE:
                 if (device.supportsInputEvents()) {
@@ -185,6 +193,8 @@ public class Controller implements AsyncProcessor {
             default:
                 // do nothing
         }
+
+        return true;
     }
 
     private boolean injectKeycode(int action, int keycode, int repeat, int metaState) {