From 97d2ecbd0f3fe5070fbb51d6e9e41daee36f544b Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Thu, 4 Feb 2021 23:07:16 +0800 Subject: [PATCH] fix autobug: don't let users try to update firmware over USB --- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 47e05df48..677704698 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1085,6 +1085,9 @@ class MeshService : Service(), Logging { setFirmwareUpdateFilename(myInfo) + val a = RadioInterfaceService.getBondedDeviceAddress(this) + val isBluetoothInterface = a != null && a.startsWith("x") + val mi = with(myInfo) { MyNodeInfo( myNodeNum, @@ -1093,7 +1096,7 @@ class MeshService : Service(), Logging { hwModel, firmwareVersion, firmwareUpdateFilename != null, - SoftwareUpdateService.shouldUpdate( + isBluetoothInterface && SoftwareUpdateService.shouldUpdate( this@MeshService, DeviceVersion(firmwareVersion) ),