From c46039bb0457f9cd776face5d5e70f4e0078fdee Mon Sep 17 00:00:00 2001 From: andrekir Date: Tue, 15 Feb 2022 20:12:04 -0300 Subject: [PATCH] Remove hw_model_deprecated --- .../java/com/geeksville/mesh/service/MeshService.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 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 ec276708d..99d4b970a 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1300,15 +1300,10 @@ class MeshService : Service(), Logging { val a = RadioInterfaceService.getBondedDeviceAddress(this) val isBluetoothInterface = a != null && a.startsWith("x") - var hwModelStr = myInfo.hwModelDeprecated - if (hwModelStr.isEmpty()) { - val nodeNum = - myInfo.myNodeNum // Note: can't use the normal property because myNodeInfo not yet setup - val ni = nodeDBbyNodeNum[nodeNum] // can't use toNodeInfo because too early - val asStr = ni?.user?.hwModelString - if (asStr != null) - hwModelStr = asStr - } + val nodeNum = + myInfo.myNodeNum // Note: can't use the normal property because myNodeInfo not yet setup + val ni = nodeDBbyNodeNum[nodeNum] // can't use toNodeInfo because too early + val hwModelStr = ni?.user?.hwModelString val mi = with(myInfo) { MyNodeInfo( myNodeNum,