From f13c05862d9ee7d09d1ad29e257645042a0e8510 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sun, 19 Apr 2020 09:23:57 -0700
Subject: [PATCH] update protos

---
 .../com/geeksville/mesh/service/MeshService.kt    | 15 ++++++---------
 app/src/main/proto                                |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index ab8a3eec8..9068b30f1 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -647,17 +647,14 @@ class MeshService : Service(), Logging {
             it.position = it.position?.copy(time = currentSecond())
         }
 
-        when (p.variantCase.number) {
-            MeshProtos.SubPacket.POSITION_FIELD_NUMBER ->
-                handleReceivedPosition(fromNum, p.position)
+        if (p.hasPosition())
+            handleReceivedPosition(fromNum, p.position)
 
-            MeshProtos.SubPacket.DATA_FIELD_NUMBER ->
-                handleReceivedData(fromNum, p.data)
+        if (p.hasData())
+            handleReceivedData(fromNum, p.data)
 
-            MeshProtos.SubPacket.USER_FIELD_NUMBER ->
-                handleReceivedUser(fromNum, p.user)
-            else -> TODO("Unexpected SubPacket variant")
-        }
+        if (p.hasUser())
+            handleReceivedUser(fromNum, p.user)
     }
 
     private fun currentSecond() = (System.currentTimeMillis() / 1000).toInt()
diff --git a/app/src/main/proto b/app/src/main/proto
index 1b2449b50..e06645d8d 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit 1b2449b50d11f66d90511559e94cdf40f525fafb
+Subproject commit e06645d8db16b9e4f23e74a931b8d5cd07bcbe3c