From 55d4d769f88ae881bccc787c2a7ba0c6b335d87d Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 12 Feb 2020 14:15:59 -0800
Subject: [PATCH] update protos

---
 app/src/main/java/com/geeksville/mesh/NodeInfo.kt            | 4 ++--
 app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 4 ++--
 app/src/main/proto/mesh.proto                                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
index 86423f661..55ea51f75 100644
--- a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
@@ -70,13 +70,13 @@ data class NodeInfo(
     val num: Int, // This is immutable, and used as a key
     var user: MeshUser? = null,
     var position: Position? = null,
-    var lastSeen: Long? = null
+    var lastSeen: Int? = null
 ) : Parcelable {
     constructor(parcel: Parcel) : this(
         parcel.readInt(),
         parcel.readParcelable(MeshUser::class.java.classLoader),
         parcel.readParcelable(Position::class.java.classLoader),
-        parcel.readValue(Long::class.java.classLoader) as? Long
+        parcel.readValue(Int::class.java.classLoader) as? Int
     ) {
     }
 
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 92b94ac6d..026e72d40 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -377,7 +377,7 @@ class MeshService : Service(), Logging {
         val p = packet.payload
 
         // Update our last seen based on any valid timestamps
-        if (packet.rxTime != 0L) {
+        if (packet.rxTime != 0) {
             updateNodeInfo(fromNum) {
                 it.lastSeen = packet.rxTime
             }
@@ -542,7 +542,7 @@ class MeshService : Service(), Logging {
             }
 
         override fun getRadioConfig(): ByteArray = toRemoteExceptions {
-            return connectedRadio.readRadioConfig()
+            connectedRadio.readRadioConfig()
         }
 
         override fun setRadioConfig(payload: ByteArray) = toRemoteExceptions {
diff --git a/app/src/main/proto/mesh.proto b/app/src/main/proto/mesh.proto
index 331e2654b..52f6f61fe 100644
--- a/app/src/main/proto/mesh.proto
+++ b/app/src/main/proto/mesh.proto
@@ -139,10 +139,10 @@ message MeshPacket {
     // MeshPayload payloads = 4;
     SubPacket payload = 3;
 
-    /// The time this message was received by the esp32 (msecs since 1970).  Note: this field is _never_ sent on the radio link itself (to save space)
+    /// The time this message was received by the esp32 (secs since 1970).  Note: this field is _never_ sent on the radio link itself (to save space)
     /// Times are typically not sent over the mesh, but they will be added to any Packet (chain of SubPacket)
     /// sent to the phone (so the phone can know exact time of reception)
-    uint64 rx_time = 4;
+    uint32 rx_time = 4;
 }
 
 /// Shared constants between device and phone