From 979c7f407f779cbf5575c86d39e39ea71b1e7ff6 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Tue, 7 Jul 2020 10:44:06 -0700
Subject: [PATCH] fix a couple of places where we were leaking macaddrs into
 logs (kinda PII)

---
 app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 2 +-
 .../com/geeksville/mesh/service/RadioInterfaceService.kt     | 5 +++--
 2 files changed, 4 insertions(+), 3 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 1b4de88e3..ed94684bb 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1508,7 +1508,7 @@ class MeshService : Service(), Logging {
     val binder = object : IMeshService.Stub() {
 
         override fun setDeviceAddress(deviceAddr: String?) = toRemoteExceptions {
-            debug("Passing through device change to radio service: $deviceAddr")
+            debug("Passing through device change to radio service: ${deviceAddr.anonymize}")
 
             val res = radio.service.setDeviceAddress(deviceAddr)
             if (res) {
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 7b674d9bb..acf156a17 100644
--- a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
@@ -12,6 +12,7 @@ import com.geeksville.android.GeeksvilleApplication
 import com.geeksville.android.Logging
 import com.geeksville.concurrent.handledLaunch
 import com.geeksville.mesh.IRadioInterfaceService
+import com.geeksville.util.anonymize
 import com.geeksville.util.ignoreException
 import com.geeksville.util.toRemoteExceptions
 import kotlinx.coroutines.CoroutineScope
@@ -216,7 +217,7 @@ class RadioInterfaceService : Service(), Logging {
             if (address == null)
                 warn("No bonded mesh radio, can't start interface")
             else {
-                info("Starting radio $address")
+                info("Starting radio ${address.anonymize}")
                 isStarted = true
 
                 if (logSends)
@@ -281,7 +282,7 @@ class RadioInterfaceService : Service(), Logging {
 
             // The device address "n" can be used to mean none
 
-            debug("Setting bonded device to $address")
+            debug("Setting bonded device to ${address.anonymize}")
 
             getPrefs(this).edit(commit = true) {
                 this.remove(DEVADDR_KEY_OLD) // remove any old version of the key