From 1a6c7c8d4e0126d801b6101529c22fad79b34aa5 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sat, 13 Jun 2020 17:02:24 -0700
Subject: [PATCH 1/4] 0.7.72

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d1a6618b3..39035cbba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 10771 // format is Mmmss (where M is 1+the numeric major number
-        versionName "0.7.71"
+        versionCode 10772 // format is Mmmss (where M is 1+the numeric major number
+        versionName "0.7.72"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

From abe0665d03d2538a2d7e34f99741b75d2899d702 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sat, 13 Jun 2020 17:02:32 -0700
Subject: [PATCH 2/4] less debug output

---
 app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 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 d746d8096..27d3c2634 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -893,7 +893,7 @@ class MeshService : Service(), Logging {
         val packet = toMeshPacket(p)
         p.status = MessageStatus.ENROUTE
         p.time = System.currentTimeMillis() // update time to the actual time we started sending
-        debug("SENDING TO RADIO: $packet")
+        // debug("SENDING TO RADIO: $packet")
         sendToRadio(packet)
     }
 
@@ -1161,7 +1161,7 @@ class MeshService : Service(), Logging {
                     try {
                         val proto =
                             MeshProtos.FromRadio.parseFrom(bytes)
-                        info("Received from radio service: ${proto.toOneLineString()}")
+                        // info("Received from radio service: ${proto.toOneLineString()}")
                         when (proto.variantCase.number) {
                             MeshProtos.FromRadio.PACKET_FIELD_NUMBER -> handleReceivedMeshPacket(
                                 proto.packet

From 65294fd638ade6fdded3ecc7dfa1348ade79ce0e Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sun, 14 Jun 2020 09:24:51 -0700
Subject: [PATCH 3/4] Return "n" if user has selected device none - fixes
 autoselect of the first BLE device that shows up

---
 .../java/com/geeksville/mesh/service/RadioInterfaceService.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 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 9322a4716..aed2886ca 100644
--- a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt
@@ -102,6 +102,7 @@ class RadioInterfaceService : Service(), Logging {
                 val isValid = when (c) {
                     'x' -> BluetoothInterface.addressValid(context, rest)
                     's' -> SerialInterface.addressValid(context, rest)
+                    'n' -> true
                     else -> TODO("Unexpected interface type $c")
                 }
                 if (!isValid)
@@ -236,7 +237,7 @@ class RadioInterfaceService : Service(), Logging {
 
 
     @SuppressLint("NewApi")
-    private fun setBondedDeviceAddress(addressIn: String?) {
+    private fun setBondedDeviceAddress(address: String?) {
         // Record that this use has configured a radio
         GeeksvilleApplication.analytics.track(
             "mesh_bond"
@@ -248,7 +249,6 @@ class RadioInterfaceService : Service(), Logging {
         }
 
         // The device address "n" can be used to mean none
-        val address = if ("n" == addressIn) null else addressIn
 
         debug("Setting bonded device to $address")
 

From 822e771a967d8063d450c30b3512103cf94fccba Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sun, 14 Jun 2020 09:33:15 -0700
Subject: [PATCH 4/4] fix missing import

---
 app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index ee9dd4823..f9c04b9f9 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -22,7 +22,6 @@ import com.geeksville.mesh.R
 import com.geeksville.mesh.model.Channel
 import com.geeksville.mesh.model.ChannelOption
 import com.geeksville.mesh.model.UIViewModel
-import com.geeksville.mesh.model.toHumanRes
 import com.geeksville.mesh.service.MeshService
 import com.geeksville.util.Exceptions
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -167,7 +166,8 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
                                 newSettings.psk = ByteString.copyFrom(Channel.channelDefaultKey)
                             }
 
-                            val selectedChannelOptionString = filled_exposed_dropdown.editableText.toString()
+                            val selectedChannelOptionString =
+                                filled_exposed_dropdown.editableText.toString()
                             newSettings.modemConfig = getModemConfig(selectedChannelOptionString)
                             // Try to change the radio, if it fails, tell the user why and throw away their redits
                             try {