TF Monitor: convert the 'when' statement to a series of if statements.

The 'when' statement is unnecessary and my attempts to convert it to modern Kotlin have resulted in fresh bugs. This version is easier to follow in any case.

Bug: 303029189
Test: Manual test
Change-Id: Ib325716dfe7f5153f71765d7ba26eb361d324311

1 files changed, 21 insertions, 18 deletions

diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt
index 6f67cba1..ed3dc24f 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt
+++ b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt
@@ -114,25 +114,28 @@ class TuningForkRequestServer(ip: String, port: Int, val requestListener: Reques
             for (h in header.indices) {
                 val value = header[h].trim { it <= ' ' }
 
-                when (true) {
-                    kContentLengthPattern.containsMatchIn(value) -> contentLen =
-                        value.HeaderTrim()
-                    kContentTypePattern.containsMatchIn(value) -> contentType =
-                        value.HeaderTrim()
-                    kConnectionTypePattern.containsMatchIn(value) -> connectionType =
-                        value.HeaderTrim()
-                    kClientHostPattern.containsMatchIn(value) -> hostname =
-                        value.HeaderTrim()
-                    kAcceptEncodingPattern.containsMatchIn(value) -> encoding =
-                        value.HeaderTrim()
-                    kUserAgentPattern.containsMatchIn(value) ->
-                        for (ua in value.split(":".toRegex())
-                            .dropLastWhile { it.isEmpty() }.toTypedArray()) {
-                            if (!ua.equals("User-Agent:", ignoreCase = true)) {
-                                userAgent += ua.trim { it <= ' ' }
-                            }
+                if (kContentLengthPattern.containsMatchIn(value)) {
+                    contentLen = value.HeaderTrim()
+                }
+                if (kContentTypePattern.containsMatchIn(value)) {
+                    contentType = value.HeaderTrim()
+                }
+                if (kConnectionTypePattern.containsMatchIn(value)) {
+                    connectionType = value.HeaderTrim();
+                }
+                if (kClientHostPattern.containsMatchIn(value)) {
+                    hostname = value.HeaderTrim()
+                }
+                if (kAcceptEncodingPattern.containsMatchIn(value)) {
+                    encoding = value.HeaderTrim()
+                }
+                if (kUserAgentPattern.containsMatchIn(value)) {
+                    for (ua in value.split(":".toRegex())
+                        .dropLastWhile { it.isEmpty() }.toTypedArray()) {
+                        if (!ua.equals("User-Agent:", ignoreCase = true)) {
+                            userAgent += ua.trim { it <= ' ' }
                         }
-                    else -> break;
+                    }
                 }
             }