meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove legacy admin

Browse source
This commit is contained in:
Garth Vander Houwen 2025-05-13 06:19:27 -07:00
parent a83e8586b7
commit 69e7a8ce4c
20 changed files with 24 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Localizable.xcstrings
View file

@ -22468,6 +22468,7 @@
}
},
"Positon config received: %@" : {
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {

3
Meshtastic/Views/Settings/Config/BluetoothConfig.swift
View file

@ -115,8 +115,7 @@ struct BluetoothConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty bluetooth config")
_ = bleManager.requestBluetoothConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/DeviceConfig.swift
View file

@ -273,8 +273,7 @@ struct DeviceConfig: View {
} else {
if node.deviceConfig == nil {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty device config")
_ = bleManager.requestDeviceConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/DisplayConfig.swift
View file

@ -178,8 +178,7 @@ struct DisplayConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty display config")
_ = bleManager.requestDisplayConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

8
Meshtastic/Views/Settings/Config/LoRaConfig.swift
View file

@ -248,13 +248,15 @@ struct LoRaConfig: View {
/// 2.5 Administration with session passkey
let expiration = node.sessionExpiration ?? Date()
if expiration < Date() || node.loRaConfig == nil {
Logger.mesh.info("⚙️ Empty or expired lora config requesting via PKI admin")
_ = bleManager.requestLoRaConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
if connectedNode.user != nil && node.user != nil {
_ = bleManager.requestLoRaConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
}
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty lora config")
_ = bleManager.requestLoRaConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/AmbientLightingConfig.swift
View file

@ -100,8 +100,7 @@ struct AmbientLightingConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty ambient lighting module config")
_ = bleManager.requestAmbientLightingConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift
View file

@ -248,8 +248,7 @@ struct CannedMessagesConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty canned messages module config")
_ = bleManager.requestCannedMessagesModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/DetectionSensorConfig.swift
View file

@ -206,8 +206,7 @@ struct DetectionSensorConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty detection sensor module config")
_ = bleManager.requestDetectionSensorModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift
View file

@ -214,8 +214,7 @@ struct ExternalNotificationConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty external notificaiton module config")
_ = bleManager.requestExternalNotificationModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
View file

@ -365,8 +365,7 @@ struct MQTTConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty mqtt module config")
_ = bleManager.requestMqttModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/PaxCounterConfig.swift
View file

@ -73,8 +73,7 @@ struct PaxCounterConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty pax counter module config")
_ = bleManager.requestPaxCounterModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift
View file

@ -96,8 +96,7 @@ struct RangeTestConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty range test module config")
_ = bleManager.requestRangeTestModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/RtttlConfig.swift
View file

@ -87,8 +87,7 @@ struct RtttlConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty ringtone module config")
_ = bleManager.requestRtttlConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/SerialConfig.swift
View file

@ -151,8 +151,7 @@ struct SerialConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty serial module config")
_ = bleManager.requestSerialModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/StoreForwardConfig.swift
View file

@ -152,8 +152,7 @@ struct StoreForwardConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty store & forward module config")
_ = bleManager.requestStoreAndForwardModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
View file

@ -149,8 +149,7 @@ struct TelemetryConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty telemetry module config")
_ = bleManager.requestTelemetryModuleConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/NetworkConfig.swift
View file

@ -158,8 +158,7 @@ struct NetworkConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty network config")
_ = bleManager.requestNetworkConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/PositionConfig.swift
View file

@ -416,8 +416,7 @@ struct PositionConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty position config")
_ = bleManager.requestPositionConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/PowerConfig.swift
View file

@ -143,8 +143,7 @@ struct PowerConfig: View {
}
} else {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty power config")
_ = bleManager.requestPowerConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}

3
Meshtastic/Views/Settings/Config/SecurityConfig.swift
View file

@ -204,8 +204,7 @@ struct SecurityConfig: View {
} else {
if node.deviceConfig == nil {
/// Legacy Administration
Logger.mesh.info("☠️ Using insecure legacy admin, empty security config")
_ = bleManager.requestSecurityConfig(fromUser: connectedNode.user!, toUser: node.user!, adminIndex: connectedNode.myInfo?.adminIndex ?? 0)
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
}
}
}