diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index 5122647a..489b0e85 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -311,10 +311,6 @@ BCE2D3C42C7AE369008E6199 /* RestartNodeIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestartNodeIntent.swift; sourceTree = ""; }; BCE2D3C62C7B0D0A008E6199 /* ShortcutsProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutsProvider.swift; sourceTree = ""; }; BCE2D3C82C7C377F008E6199 /* FactoryResetNodeIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FactoryResetNodeIntent.swift; sourceTree = ""; }; - D32BA3912D54617800714840 /* NodeInfoEntity+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NodeInfoEntity+CoreDataClass.swift"; sourceTree = ""; }; - D32BA3922D54617800714840 /* NodeInfoEntity+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NodeInfoEntity+CoreDataProperties.swift"; sourceTree = ""; }; - D32BA3932D54617800714840 /* UserEntity+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserEntity+CoreDataClass.swift"; sourceTree = ""; }; - D32BA3942D54617800714840 /* UserEntity+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserEntity+CoreDataProperties.swift"; sourceTree = ""; }; D93068D22B8129510066FBC8 /* MessageContextMenuItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageContextMenuItems.swift; sourceTree = ""; }; D93068D42B812B700066FBC8 /* MessageDestination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageDestination.swift; sourceTree = ""; }; D93068D62B8146690066FBC8 /* MessageText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageText.swift; sourceTree = ""; }; @@ -678,17 +674,6 @@ path = Custom; sourceTree = ""; }; - D32BA3902D54612800714840 /* CoreData */ = { - isa = PBXGroup; - children = ( - D32BA3912D54617800714840 /* NodeInfoEntity+CoreDataClass.swift */, - D32BA3922D54617800714840 /* NodeInfoEntity+CoreDataProperties.swift */, - D32BA3932D54617800714840 /* UserEntity+CoreDataClass.swift */, - D32BA3942D54617800714840 /* UserEntity+CoreDataProperties.swift */, - ); - path = CoreData; - sourceTree = ""; - }; D9C9839E2B79D0C600BDBE6A /* TextMessageField */ = { isa = PBXGroup; children = ( @@ -956,7 +941,6 @@ DDC2E15626CE248E0042C5E4 /* Meshtastic */ = { isa = PBXGroup; children = ( - D32BA3902D54612800714840 /* CoreData */, BCB6137F2C6728E700485544 /* AppIntents */, DD1BD0EC2C603C5B008C0C70 /* Measurement */, 25F5D5BC2C3F6D7B008036E3 /* Router */, diff --git a/Meshtastic/CoreData/NodeInfoEntity+CoreDataClass.swift b/Meshtastic/CoreData/NodeInfoEntity+CoreDataClass.swift deleted file mode 100644 index 37c14e81..00000000 --- a/Meshtastic/CoreData/NodeInfoEntity+CoreDataClass.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// NodeInfoEntity+CoreDataClass.swift -// -// -// Created by Brian Floersch on 2/5/25. -// -// - -import Foundation -import CoreData - -@objc(NodeInfoEntity) -public class NodeInfoEntity: NSManagedObject { - -} diff --git a/Meshtastic/CoreData/NodeInfoEntity+CoreDataProperties.swift b/Meshtastic/CoreData/NodeInfoEntity+CoreDataProperties.swift deleted file mode 100644 index 4df81fe2..00000000 --- a/Meshtastic/CoreData/NodeInfoEntity+CoreDataProperties.swift +++ /dev/null @@ -1,200 +0,0 @@ -// -// NodeInfoEntity+CoreDataProperties.swift -// -// -// Created by Brian Floersch on 2/5/25. -// -// - -import Foundation -import CoreData - -extension NodeInfoEntity { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "NodeInfoEntity") - } - - @NSManaged public var bleName: String? - @NSManaged public var channel: Int32 - @NSManaged public var favorite: Bool - @NSManaged public var firstHeard: Date? - @NSManaged public var hopsAway: Int32 - @NSManaged public var id: Int64 - @NSManaged public var ignored: Bool - @NSManaged public var lastHeard: Date? - @NSManaged public var num: Int64 - @NSManaged public var peripheralId: String? - @NSManaged public var rssi: Int32 - @NSManaged public var sessionExpiration: Date? - @NSManaged public var sessionPasskey: Data? - @NSManaged public var snr: Float - @NSManaged public var viaMqtt: Bool - @NSManaged public var ambientLightingConfig: AmbientLightingConfigEntity? - @NSManaged public var bluetoothConfig: BluetoothConfigEntity? - @NSManaged public var cannedMessageConfig: CannedMessageConfigEntity? - @NSManaged public var detectionSensorConfig: DetectionSensorConfigEntity? - @NSManaged public var deviceConfig: DeviceConfigEntity? - @NSManaged public var displayConfig: DisplayConfigEntity? - @NSManaged public var externalNotificationConfig: ExternalNotificationConfigEntity? - @NSManaged public var loRaConfig: LoRaConfigEntity? - @NSManaged public var metadata: DeviceMetadataEntity? - @NSManaged public var mqttConfig: MQTTConfigEntity? - @NSManaged public var myInfo: MyInfoEntity? - @NSManaged public var networkConfig: NetworkConfigEntity? - @NSManaged public var pax: NSOrderedSet? - @NSManaged public var paxCounterConfig: PaxCounterConfigEntity? - @NSManaged public var positionConfig: PositionConfigEntity? - @NSManaged public var positions: NSOrderedSet? - @NSManaged public var powerConfig: PowerConfigEntity? - @NSManaged public var rangeTestConfig: RangeTestConfigEntity? - @NSManaged public var rtttlConfig: RTTTLConfigEntity? - @NSManaged public var securityConfig: SecurityConfigEntity? - @NSManaged public var serialConfig: SerialConfigEntity? - @NSManaged public var storeForwardConfig: StoreForwardConfigEntity? - @NSManaged public var telemetries: NSOrderedSet? - @NSManaged public var telemetryConfig: TelemetryConfigEntity? - @NSManaged public var traceRoutes: NSOrderedSet? - @NSManaged public var user: UserEntity? - -} - -// MARK: Generated accessors for pax -extension NodeInfoEntity { - - @objc(insertObject:inPaxAtIndex:) - @NSManaged public func insertIntoPax(_ value: PaxCounterEntity, at idx: Int) - - @objc(removeObjectFromPaxAtIndex:) - @NSManaged public func removeFromPax(at idx: Int) - - @objc(insertPax:atIndexes:) - @NSManaged public func insertIntoPax(_ values: [PaxCounterEntity], at indexes: NSIndexSet) - - @objc(removePaxAtIndexes:) - @NSManaged public func removeFromPax(at indexes: NSIndexSet) - - @objc(replaceObjectInPaxAtIndex:withObject:) - @NSManaged public func replacePax(at idx: Int, with value: PaxCounterEntity) - - @objc(replacePaxAtIndexes:withPax:) - @NSManaged public func replacePax(at indexes: NSIndexSet, with values: [PaxCounterEntity]) - - @objc(addPaxObject:) - @NSManaged public func addToPax(_ value: PaxCounterEntity) - - @objc(removePaxObject:) - @NSManaged public func removeFromPax(_ value: PaxCounterEntity) - - @objc(addPax:) - @NSManaged public func addToPax(_ values: NSOrderedSet) - - @objc(removePax:) - @NSManaged public func removeFromPax(_ values: NSOrderedSet) - -} - -// MARK: Generated accessors for positions -extension NodeInfoEntity { - - @objc(insertObject:inPositionsAtIndex:) - @NSManaged public func insertIntoPositions(_ value: PositionEntity, at idx: Int) - - @objc(removeObjectFromPositionsAtIndex:) - @NSManaged public func removeFromPositions(at idx: Int) - - @objc(insertPositions:atIndexes:) - @NSManaged public func insertIntoPositions(_ values: [PositionEntity], at indexes: NSIndexSet) - - @objc(removePositionsAtIndexes:) - @NSManaged public func removeFromPositions(at indexes: NSIndexSet) - - @objc(replaceObjectInPositionsAtIndex:withObject:) - @NSManaged public func replacePositions(at idx: Int, with value: PositionEntity) - - @objc(replacePositionsAtIndexes:withPositions:) - @NSManaged public func replacePositions(at indexes: NSIndexSet, with values: [PositionEntity]) - - @objc(addPositionsObject:) - @NSManaged public func addToPositions(_ value: PositionEntity) - - @objc(removePositionsObject:) - @NSManaged public func removeFromPositions(_ value: PositionEntity) - - @objc(addPositions:) - @NSManaged public func addToPositions(_ values: NSOrderedSet) - - @objc(removePositions:) - @NSManaged public func removeFromPositions(_ values: NSOrderedSet) - -} - -// MARK: Generated accessors for telemetries -extension NodeInfoEntity { - - @objc(insertObject:inTelemetriesAtIndex:) - @NSManaged public func insertIntoTelemetries(_ value: TelemetryEntity, at idx: Int) - - @objc(removeObjectFromTelemetriesAtIndex:) - @NSManaged public func removeFromTelemetries(at idx: Int) - - @objc(insertTelemetries:atIndexes:) - @NSManaged public func insertIntoTelemetries(_ values: [TelemetryEntity], at indexes: NSIndexSet) - - @objc(removeTelemetriesAtIndexes:) - @NSManaged public func removeFromTelemetries(at indexes: NSIndexSet) - - @objc(replaceObjectInTelemetriesAtIndex:withObject:) - @NSManaged public func replaceTelemetries(at idx: Int, with value: TelemetryEntity) - - @objc(replaceTelemetriesAtIndexes:withTelemetries:) - @NSManaged public func replaceTelemetries(at indexes: NSIndexSet, with values: [TelemetryEntity]) - - @objc(addTelemetriesObject:) - @NSManaged public func addToTelemetries(_ value: TelemetryEntity) - - @objc(removeTelemetriesObject:) - @NSManaged public func removeFromTelemetries(_ value: TelemetryEntity) - - @objc(addTelemetries:) - @NSManaged public func addToTelemetries(_ values: NSOrderedSet) - - @objc(removeTelemetries:) - @NSManaged public func removeFromTelemetries(_ values: NSOrderedSet) - -} - -// MARK: Generated accessors for traceRoutes -extension NodeInfoEntity { - - @objc(insertObject:inTraceRoutesAtIndex:) - @NSManaged public func insertIntoTraceRoutes(_ value: TraceRouteEntity, at idx: Int) - - @objc(removeObjectFromTraceRoutesAtIndex:) - @NSManaged public func removeFromTraceRoutes(at idx: Int) - - @objc(insertTraceRoutes:atIndexes:) - @NSManaged public func insertIntoTraceRoutes(_ values: [TraceRouteEntity], at indexes: NSIndexSet) - - @objc(removeTraceRoutesAtIndexes:) - @NSManaged public func removeFromTraceRoutes(at indexes: NSIndexSet) - - @objc(replaceObjectInTraceRoutesAtIndex:withObject:) - @NSManaged public func replaceTraceRoutes(at idx: Int, with value: TraceRouteEntity) - - @objc(replaceTraceRoutesAtIndexes:withTraceRoutes:) - @NSManaged public func replaceTraceRoutes(at indexes: NSIndexSet, with values: [TraceRouteEntity]) - - @objc(addTraceRoutesObject:) - @NSManaged public func addToTraceRoutes(_ value: TraceRouteEntity) - - @objc(removeTraceRoutesObject:) - @NSManaged public func removeFromTraceRoutes(_ value: TraceRouteEntity) - - @objc(addTraceRoutes:) - @NSManaged public func addToTraceRoutes(_ values: NSOrderedSet) - - @objc(removeTraceRoutes:) - @NSManaged public func removeFromTraceRoutes(_ values: NSOrderedSet) - -} diff --git a/Meshtastic/CoreData/UserEntity+CoreDataClass.swift b/Meshtastic/CoreData/UserEntity+CoreDataClass.swift deleted file mode 100644 index cd207492..00000000 --- a/Meshtastic/CoreData/UserEntity+CoreDataClass.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// UserEntity+CoreDataClass.swift -// -// -// Created by Brian Floersch on 2/5/25. -// -// - -import Foundation -import CoreData - -@objc(UserEntity) -public class UserEntity: NSManagedObject { - -} diff --git a/Meshtastic/CoreData/UserEntity+CoreDataProperties.swift b/Meshtastic/CoreData/UserEntity+CoreDataProperties.swift deleted file mode 100644 index 753bba68..00000000 --- a/Meshtastic/CoreData/UserEntity+CoreDataProperties.swift +++ /dev/null @@ -1,108 +0,0 @@ -// -// UserEntity+CoreDataProperties.swift -// -// -// Created by Brian Floersch on 2/5/25. -// -// - -import Foundation -import CoreData - -extension UserEntity { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "UserEntity") - } - - @NSManaged public var hwDisplayName: String? - @NSManaged public var hwModel: String? - @NSManaged public var hwModelId: Int32 - @NSManaged public var isLicensed: Bool - @NSManaged public var keyMatch: Bool - @NSManaged public var lastMessage: Date? - @NSManaged public var longName: String? - @NSManaged public var mute: Bool - @NSManaged public var newPublicKey: Data? - @NSManaged public var num: Int64 - @NSManaged public var numString: String? - @NSManaged public var pkiEncrypted: Bool - @NSManaged public var publicKey: Data? - @NSManaged public var role: Int32 - @NSManaged public var shortName: String? - @NSManaged public var userId: String? - @NSManaged public var receivedMessages: NSOrderedSet? - @NSManaged public var sentMessages: NSOrderedSet? - @NSManaged public var userNode: NodeInfoEntity? - -} - -// MARK: Generated accessors for receivedMessages -extension UserEntity { - - @objc(insertObject:inReceivedMessagesAtIndex:) - @NSManaged public func insertIntoReceivedMessages(_ value: MessageEntity, at idx: Int) - - @objc(removeObjectFromReceivedMessagesAtIndex:) - @NSManaged public func removeFromReceivedMessages(at idx: Int) - - @objc(insertReceivedMessages:atIndexes:) - @NSManaged public func insertIntoReceivedMessages(_ values: [MessageEntity], at indexes: NSIndexSet) - - @objc(removeReceivedMessagesAtIndexes:) - @NSManaged public func removeFromReceivedMessages(at indexes: NSIndexSet) - - @objc(replaceObjectInReceivedMessagesAtIndex:withObject:) - @NSManaged public func replaceReceivedMessages(at idx: Int, with value: MessageEntity) - - @objc(replaceReceivedMessagesAtIndexes:withReceivedMessages:) - @NSManaged public func replaceReceivedMessages(at indexes: NSIndexSet, with values: [MessageEntity]) - - @objc(addReceivedMessagesObject:) - @NSManaged public func addToReceivedMessages(_ value: MessageEntity) - - @objc(removeReceivedMessagesObject:) - @NSManaged public func removeFromReceivedMessages(_ value: MessageEntity) - - @objc(addReceivedMessages:) - @NSManaged public func addToReceivedMessages(_ values: NSOrderedSet) - - @objc(removeReceivedMessages:) - @NSManaged public func removeFromReceivedMessages(_ values: NSOrderedSet) - -} - -// MARK: Generated accessors for sentMessages -extension UserEntity { - - @objc(insertObject:inSentMessagesAtIndex:) - @NSManaged public func insertIntoSentMessages(_ value: MessageEntity, at idx: Int) - - @objc(removeObjectFromSentMessagesAtIndex:) - @NSManaged public func removeFromSentMessages(at idx: Int) - - @objc(insertSentMessages:atIndexes:) - @NSManaged public func insertIntoSentMessages(_ values: [MessageEntity], at indexes: NSIndexSet) - - @objc(removeSentMessagesAtIndexes:) - @NSManaged public func removeFromSentMessages(at indexes: NSIndexSet) - - @objc(replaceObjectInSentMessagesAtIndex:withObject:) - @NSManaged public func replaceSentMessages(at idx: Int, with value: MessageEntity) - - @objc(replaceSentMessagesAtIndexes:withSentMessages:) - @NSManaged public func replaceSentMessages(at indexes: NSIndexSet, with values: [MessageEntity]) - - @objc(addSentMessagesObject:) - @NSManaged public func addToSentMessages(_ value: MessageEntity) - - @objc(removeSentMessagesObject:) - @NSManaged public func removeFromSentMessages(_ value: MessageEntity) - - @objc(addSentMessages:) - @NSManaged public func addToSentMessages(_ values: NSOrderedSet) - - @objc(removeSentMessages:) - @NSManaged public func removeFromSentMessages(_ values: NSOrderedSet) - -}