Meshtastic-Apple/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift

48 lines
1.6 KiB
Swift
Raw Permalink Normal View History

// NodeInfoEntityToNodeInfo.swift
// Meshtastic
//
// Utility to convert NodeInfoEntity (Core Data) to NodeInfo (protobuf)
import Foundation
import MeshtasticProtobufs
extension NodeInfoEntity {
func toProto() -> NodeInfo {
var userProto = User()
if let user = self.user {
userProto.id = user.userId ?? ""
userProto.longName = user.longName ?? ""
userProto.shortName = user.shortName ?? ""
2025-05-13 20:11:27 -05:00
userProto.hwModel = HardwareModel(rawValue: Int(user.hwModelId)) ?? .unset
userProto.isLicensed = user.isLicensed
2025-05-25 09:25:58 -07:00
if userProto.hasIsUnmessagable == true {
userProto.isUnmessagable = user.unmessagable
}
2025-05-13 20:11:27 -05:00
userProto.role = Config.DeviceConfig.Role(rawValue: Int(user.role)) ?? .client
userProto.publicKey = user.publicKey?.subdata(in: 0..<user.publicKey!.count) ?? Data()
}
var node = NodeInfo()
node.num = UInt32(self.num)
node.user = userProto
// Add more fields as needed
return node
}
}
2.7.4 Working Changes (#1415) * Update messaging list separator insets * Dont show unread messages or notifications for emoji reactions matching iMessage. * Restore ble state method (#1416) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Two Column Node List (#1425) * Restore BLE State * Log privacy * AccessoryManager to handle restored connection * Comment task out * Switch the node list to a two column layout * Keep asian translations of channel details string * Update restore state function based on conversation with jake * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * always show node list search bar * Update auto correct modifier * Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover * Work in progress. * Update detents * Gate the discovery process while restoring * Use geometry reader to size weather tiles on node details * Update BLE Transport * Update location weather condistion styles * Log privacy in didReceive * Remove extra dividers from admin key config, fix onboarding typo * Bump minimum catalyst target * Bump mac target version * Use @FetchRequest for UserList to try and use less memory on ios 17 * Revert change to @fetchrequest * Stab in the dark for Devices crash * Updated UserList (back?) to @FetchRequest * Set mac minimum to 15 * Nil out continuation after use * Use @FetchRequest for the node list to stop crashes on iOS 17 * Handle failed connections during restoration --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update protos * Update protos * Remove stale keys * Serbian translations update (#1422) * Log privacy * Add Serbian translations --------- Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com> * Clarify public key sub-text in security settings (#1412) * Clarify public key sub-text in settings * Trigger lint * freq slot num pad (#1410) * kill keyboard toolbar on lora config * delete extranious scrollDismissesKeyboard * Properly set catalyst target * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Views/Settings/Config/SecurityConfig.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Enums/DeviceEnums.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Make current location nilable, remove log spam * clean up toUser logic * Fix telemetry entity not added in nodeInfoPacket * fix typo: powerMetrics.hasChXCurrent mismatch * Duplicate decoding of telemetry.current removed * Clean up mesh map fetch request and distance filter logic * Revert attempt to fix message logic * Bump datadog version * Missing message fix, attempt #2 (#1431) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Retry fewer times for longer * Revert "Missing message fix, attempt #2 (#1431)" (#1432) This reverts commit a96d318adb476eccc624a460fcdc7fb92aa9edbb. * Make retry 2 seconds * Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database * Add clear notifications function * Link from channel messages to node info * Link to node details * Discovery on retry fix * Discovery on retry fix fix * Add contact to device node db if you get an encrypted send faild routing error * Seperate channel message view into two views for better performance. * Refactor User Message List * Update device hardware Add liquid glass to config save button * Save button cleanup * Update button structure on users view * Move encrypted send logic out of the router. Update protos * Restore node long- and short- names (#1442) Co-authored-by: Jake-B <jake-b@users.noreply.github.com> * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert routing error * Toggle for enabling device telemetry broadcast enable * Update * Enhancements for interval dropdowns (#1445) * Cleanup * Fix core data version * Add never to update interval * Device telemetry Enabled Boolean (#1446) * Update core data and interval picker * Move formatter * Rework to nest options under enabled * Clearer names * Safer devicehardware api call, remove node history filter from mesh map * Fix build * Simplify mesh map filter * Remove stale translation keys --------- Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com> Co-authored-by: Spencer Smith <dontaskspencer@gmail.com> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2025-10-05 17:51:18 -07:00
extension UserEntity {
func toProto() -> User {
var userProto = User()
userProto.id = self.userId ?? ""
userProto.longName = self.longName ?? ""
userProto.shortName = self.shortName ?? ""
userProto.hwModel = HardwareModel(rawValue: Int(self.hwModelId)) ?? .unset
userProto.isLicensed = self.isLicensed
if userProto.hasIsUnmessagable == true {
userProto.isUnmessagable = self.unmessagable
}
userProto.role = Config.DeviceConfig.Role(rawValue: Int(self.role)) ?? .client
userProto.publicKey = self.publicKey?.subdata(in: 0..<self.publicKey!.count) ?? Data()
return userProto
}
}