From 671bafa05f3cd04e7cb056aa85a9980ec2a6e4ed Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Tue, 21 Apr 2020 08:18:46 -0700
Subject: [PATCH] don't leak macaddrs into logs - could be possibly personally
 identifying

---
 .../com/geeksville/mesh/service/RadioInterfaceService.kt   | 5 +++--
 .../main/java/com/geeksville/mesh/ui/SettingsFragment.kt   | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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 fbaa8cf96..706541f6b 100644
--- a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
@@ -17,6 +17,7 @@ import com.geeksville.android.GeeksvilleApplication
 import com.geeksville.android.Logging
 import com.geeksville.concurrent.DeferredExecution
 import com.geeksville.mesh.IRadioInterfaceService
+import com.geeksville.mesh.anonymized
 import com.geeksville.util.exceptionReporter
 import com.geeksville.util.ignoreException
 import com.geeksville.util.toRemoteExceptions
@@ -178,7 +179,7 @@ class RadioInterfaceService : Service(), Logging {
                 val address = getPrefs(context).getString(DEVADDR_KEY, null)
 
                 if (address != null && !allPaired.contains(address)) {
-                    warn("Ignoring stale bond to $address")
+                    warn("Ignoring stale bond to ${address.anonymized}")
                     null
                 } else
                     address
@@ -440,7 +441,7 @@ class RadioInterfaceService : Service(), Logging {
                     // device is off/not connected)
                     val device = getBluetoothAdapter(this)?.getRemoteDevice(address)
                     if (device != null) {
-                        info("Creating radio interface service.  device=$address")
+                        info("Creating radio interface service.  device=${address.anonymized}")
 
                         // Note this constructor also does no comm
                         val s = SafeBluetooth(this, device)
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 92f689174..a1d5226d7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -26,6 +26,7 @@ import com.geeksville.android.Logging
 import com.geeksville.android.hideKeyboard
 import com.geeksville.mesh.MainActivity
 import com.geeksville.mesh.R
+import com.geeksville.mesh.anonymized
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.service.RadioInterfaceService
 import com.geeksville.util.exceptionReporter
@@ -91,6 +92,10 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
 
     data class BTScanEntry(val name: String, val macAddress: String, val bonded: Boolean) {
         // val isSelected get() = macAddress == selectedMacAddr
+
+        override fun toString(): String {
+            return "BTScanEntry(name=${name.anonymized}, addr=${macAddress.anonymized})"
+        }
     }
 
     override fun onCleared() {
@@ -264,7 +269,7 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
 
     /// Change to a new macaddr selection, updating GUI and radio
     fun changeScanSelection(context: MainActivity, newAddr: String) {
-        info("Changing BT device to $newAddr")
+        info("Changing BT device to ${newAddr.anonymized}")
         selectedMacAddr = newAddr
         changeDeviceSelection(context, newAddr)
     }