From d1afb6fac6a5a9eecffdd70d8b7a26874cc39e26 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sun, 12 Apr 2020 10:56:45 -0700
Subject: [PATCH] don't leak personal data into logs

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

diff --git a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
index fdd8bf6ef..336463662 100644
--- a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
@@ -10,9 +10,11 @@ import com.geeksville.mesh.ui.latLongToMeter
  * When printing strings to logs sometimes we want to print useful debugging information about users
  * or positions.  But we don't want to leak things like usernames or locations.  So this function
  * if given a string, will return a string which is a maximum of three characters long, taken from the tail
- * of the string.  Which should effectively hide real usernames and locations, but still let us see if values were zero or empty.
+ * of the string.  Which should effectively hide real usernames and locations,
+ * but still let us see if values were zero, empty or different.
  */
-val Any.anonymized: String get() = this.toString().takeLast(3) + "..."
+val Any?.anonymized: String
+    get() = if (this != null) ("..." + this.toString().takeLast(3)) else "null"
 
 // model objects that directly map to the corresponding protobufs
 data class MeshUser(val id: String, val longName: String, val shortName: String) :
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 9f811f1ed..4ce9a3aae 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -708,7 +708,7 @@ class MeshService : Service(), Logging {
         while (infoBytes != null) {
             val info =
                 MeshProtos.NodeInfo.parseFrom(infoBytes)
-            debug("Received initial nodeinfo $info")
+            debug("Received initial nodeinfo num=${info.num}, hasUser=${info.hasUser()}, hasPosition=${info.hasPosition()}")
 
             // Just replace/add any entry
             updateNodeInfo(info.num) {
diff --git a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
index 10edefc52..b5f66757a 100644
--- a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
@@ -313,7 +313,7 @@ class RadioInterfaceService : Service(), Logging {
         // FIXME - no need to discover services more than once - instead use lazy() to use them in future attempts
         safe!!.asyncDiscoverServices { discRes ->
             discRes.getOrThrow() // FIXME, instead just try to reconnect?
-            debug("Discovered services!")
+            debug("Discovered services! Service size=${service.characteristics.size}")
 
             // we begin by setting our MTU size as high as it can go
             safe!!.asyncRequestMtu(512) { mtuRes ->