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 { 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 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") 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 {