mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* 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 a96d318adb.
* 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>
153 lines
4.2 KiB
Swift
153 lines
4.2 KiB
Swift
//
|
|
// UserEntityExtension.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 6/3/22.
|
|
//
|
|
|
|
import Foundation
|
|
import CoreData
|
|
import MeshtasticProtobufs
|
|
|
|
extension UserEntity {
|
|
|
|
var messageList: [MessageEntity] {
|
|
let context = PersistenceController.shared.container.viewContext
|
|
let fetchRequest = MessageEntity.fetchRequest()
|
|
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
|
|
fetchRequest.predicate = NSPredicate(format: "((toUser == %@) OR (fromUser == %@)) AND toUser != nil AND fromUser != nil AND isEmoji == false AND admin = false AND portNum != 10", self, self)
|
|
|
|
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
|
|
}
|
|
|
|
var sensorMessageList: [MessageEntity] {
|
|
let context = PersistenceController.shared.container.viewContext
|
|
let fetchRequest = MessageEntity.fetchRequest()
|
|
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
|
|
fetchRequest.predicate = NSPredicate(format: "(fromUser == %@) AND portNum = 10", self)
|
|
|
|
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
|
|
}
|
|
|
|
var unreadMessages: Int {
|
|
let unreadMessages = messageList.filter { ($0 as AnyObject).read == false && ($0 as AnyObject).isEmoji == false }
|
|
return unreadMessages.count
|
|
}
|
|
/// SVG Images for Vendors who are signed project backers
|
|
var hardwareImage: String? {
|
|
guard let hwModel else { return nil }
|
|
switch hwModel {
|
|
/// Heltec
|
|
case "HELTECHT62":
|
|
return "HELTECHT62"
|
|
case "HELTECMESHNODET114":
|
|
return "HELTECMESHNODET114"
|
|
case "HELTECV3":
|
|
return "HELTECV3"
|
|
case "HELTECMESHPOCKET":
|
|
return "HELTECMESHPOCKET"
|
|
case "HELTECVISIONMASTERE213":
|
|
return "HELTECVISIONMASTERE213"
|
|
case "HELTECVISIONMASTERE290":
|
|
return "HELTECVISIONMASTERE290"
|
|
case "HELTECWIRELESSPAPER", "HELTECWIRELESSPAPERV10":
|
|
return "HELTECWIRELESSPAPER"
|
|
case "HELTECWIRELESSTRACKER", "HELTECWIRELESSTRACKERV10":
|
|
return "HELTECWIRELESSTRACKER"
|
|
case "HELTECWSLV3":
|
|
return "HELTECWSLV3"
|
|
/// LilyGO
|
|
case "TDECK":
|
|
return "TDECK"
|
|
case "TECHO":
|
|
return "TECHO"
|
|
case "TWATCHS3":
|
|
return "TWATCHS3"
|
|
case "LILYGOTBEAMS3CORE":
|
|
return "LILYGOTBEAMS3CORE"
|
|
case "TBEAM", "TBEAM_V0P7":
|
|
return "TBEAM"
|
|
case "TLORAC6":
|
|
return "TLORAC6"
|
|
case "TLORAT3S3EPAPER":
|
|
return "TLORAT3S3EPAPER"
|
|
case "TLORAT3S3V1", "TLORAT3S3":
|
|
return "TLORAT3S3V1"
|
|
case "TLORAV211P6":
|
|
return "TLORAV211P6"
|
|
case "TLORAV211P8":
|
|
return "TLORAV211P8"
|
|
/// Seeed Studio
|
|
case "SENSECAPINDICATOR":
|
|
return "SENSECAPINDICATOR"
|
|
case "TRACKERT1000E":
|
|
return "TRACKERT1000E"
|
|
case "SEEEDXIAOS3":
|
|
return "SEEEDXIAOS3"
|
|
case "WIOWM1110":
|
|
return "WIOWM1110"
|
|
case "SEEEDSOLARNODE":
|
|
return "SEEEDSOLARNODE"
|
|
case "SEEEDWIOTRACKERL1":
|
|
return "SEEEDWIOTRACKERL1"
|
|
/// RAK Wireless
|
|
case "RAK4631":
|
|
return "RAK4631"
|
|
case "RAK11310":
|
|
return "RAK11310"
|
|
case "WISMESHTAP":
|
|
return "WISMESHTAP"
|
|
/// B&Q Consulting
|
|
case "NANOG1", "NANOG1EXPLORER":
|
|
return "NANOG1"
|
|
case "NANOG2ULTRA":
|
|
return "NANOG2ULTRA"
|
|
case "STATIONG2":
|
|
return "STATIONG2"
|
|
/// DIY Devices
|
|
case "RPIPICO":
|
|
return "RPIPICO"
|
|
default:
|
|
return "UNSET"
|
|
}
|
|
}
|
|
}
|
|
|
|
public func createUser(num: Int64, context: NSManagedObjectContext) throws -> UserEntity {
|
|
// Validate Input
|
|
guard num >= 0 else {
|
|
throw CoreDataError.invalidInput(message: "User number cannot be negative.")
|
|
}
|
|
|
|
var newUser: UserEntity! // Use an implicitly unwrapped optional, but ensure it's assigned
|
|
|
|
context.performAndWait {
|
|
newUser = UserEntity(context: context)
|
|
newUser.num = num
|
|
let userId = num.toHex()
|
|
newUser.userId = userId
|
|
let last4 = String(userId.suffix(4))
|
|
newUser.longName = "Meshtastic \(last4)"
|
|
newUser.shortName = last4
|
|
newUser.hwModel = "UNSET"
|
|
}
|
|
|
|
return newUser
|
|
}
|
|
|
|
enum CoreDataError: Error, LocalizedError {
|
|
case invalidInput(message: String)
|
|
case saveFailed(message: String)
|
|
case entityCreationFailed(message: String) // In case UserEntity(context:) fails for some reason
|
|
|
|
var errorDescription: String? {
|
|
switch self {
|
|
case .invalidInput(let message):
|
|
return "Core Data Input Error: \(message)"
|
|
case .saveFailed(let message):
|
|
return "Core Data Save Error: \(message)"
|
|
case .entityCreationFailed(let message):
|
|
return "Core Data Entity Creation Error: \(message)"
|
|
}
|
|
}
|
|
}
|