Remove hw_model_deprecated

pull/378/head
andrekir 2022-02-15 20:12:04 -03:00
rodzic c97ebb6637
commit c46039bb04
1 zmienionych plików z 4 dodań i 9 usunięć

Wyświetl plik

@ -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,