kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
Remove hw_model_deprecated
rodzic
c97ebb6637
commit
c46039bb04
|
@ -1300,15 +1300,10 @@ class MeshService : Service(), Logging {
|
||||||
val a = RadioInterfaceService.getBondedDeviceAddress(this)
|
val a = RadioInterfaceService.getBondedDeviceAddress(this)
|
||||||
val isBluetoothInterface = a != null && a.startsWith("x")
|
val isBluetoothInterface = a != null && a.startsWith("x")
|
||||||
|
|
||||||
var hwModelStr = myInfo.hwModelDeprecated
|
|
||||||
if (hwModelStr.isEmpty()) {
|
|
||||||
val nodeNum =
|
val nodeNum =
|
||||||
myInfo.myNodeNum // Note: can't use the normal property because myNodeInfo not yet setup
|
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 ni = nodeDBbyNodeNum[nodeNum] // can't use toNodeInfo because too early
|
||||||
val asStr = ni?.user?.hwModelString
|
val hwModelStr = ni?.user?.hwModelString
|
||||||
if (asStr != null)
|
|
||||||
hwModelStr = asStr
|
|
||||||
}
|
|
||||||
val mi = with(myInfo) {
|
val mi = with(myInfo) {
|
||||||
MyNodeInfo(
|
MyNodeInfo(
|
||||||
myNodeNum,
|
myNodeNum,
|
||||||
|
|
Ładowanie…
Reference in New Issue