mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Remove extra want config call when adding a contact * App badge and unnecessary notification fixes (#1455) * - Fix for app badge not going to zero if a message arrives while you have that chat open - Fix for push notifications popping up when a message is received while that chat is open * Fix for cancelling notifications, works now. And scroll to bottom of conversation upon new message * Fix: Channels help grammer fix (#1452) * remove outdated TCP not available on Apple devices (#1450) * Update initial onboarding view * remove toggle gating for mac * Update crash reporting opt out in real time * Update onboarding text * Use mDNS text records for node name * TCP IP and port on the connection screen * Hide app icon chooser on mac * Infinite loop hang bugfixes and performance improvements for both `UserMessageList` and `ChannelMessageList` (#1465) * 2.7.5 Working Changes (#1460) * Remove extra want config call when adding a contact * App badge and unnecessary notification fixes (#1455) * - Fix for app badge not going to zero if a message arrives while you have that chat open - Fix for push notifications popping up when a message is received while that chat is open * Fix for cancelling notifications, works now. And scroll to bottom of conversation upon new message * Fix: Channels help grammer fix (#1452) * remove outdated TCP not available on Apple devices (#1450) * Update initial onboarding view * remove toggle gating for mac * Update crash reporting opt out in real time * Update onboarding text --------- Co-authored-by: Gnome Adrift <646322+gnomeadrift@users.noreply.github.com> Co-authored-by: Zain Kergaye <62440012+ZainKergaye@users.noreply.github.com> Co-authored-by: NillRudd <102033730+NillRudd@users.noreply.github.com> * UserEntity: add mostRecentMessage and unreadMessages with early exit when lastMessage is nil, and fetch 1 row (not N) otherwise * UserList: replace 5 slow calls to user.messageList with new fast calls * NodeList: always put the connected node at the top of list (if it matches the node filters) * ChannelEntity: add faster mostRecentPrivateMessage and unreadMessages which fetch 1 row (not N) * ChannelList: replace 5 calls to channel.allPrivateMessage with new fast calls * Fix incorrect appState.unreadDirectMessages calculations * MyInfoEntity: also fix unreadMessages count here to be fast, and use it for appState.unreadChannelMessages * UserMessageList: use @FetchRequest to prevent the N^2 behavior that was happening in calls to allPrivateMessages * Refactor ChannelEntityExtension and MyInfoEntityExtension to be more similar to UserEntityExtension * Remove SwiftUI-infinite-loop-causing `.id(redrawTapbacksTrigger)` in ChannelMessageList and UserMessageList (duplicate row ids) * MyInfoEntityExtension: exclude emoji tapbacks (which never get marked as read anyway) from unread message count * Add SaveChannelLinkData so MessageText and MeshtasticApp can use .sheet(item: ...) and avoid infinite loop hang due to Binding rebuild * ChannelMessageList and UserMessageList: switch to stable messageId for ForEach SwiftUI row identity * ChannelMessageList and UserMessageList: debouncedScrollToBottom; keyboardWillShowNotification/keyboardDidShowNotification * ChannelMessageList and UserMessageList: scroll to bottom onFirstAppear * ChannelMessageList and UserMessageList: block spurious markMessagesAsRead when this View is not active --------- Co-authored-by: Garth Vander Houwen <garth@meshtastic.com> Co-authored-by: Gnome Adrift <646322+gnomeadrift@users.noreply.github.com> Co-authored-by: Zain Kergaye <62440012+ZainKergaye@users.noreply.github.com> Co-authored-by: NillRudd <102033730+NillRudd@users.noreply.github.com> * message-list-performance: revert scrolling changes (#1472) * Reverte0f0b4a0f7(ChannelMessageList and UserMessageList: scroll to bottom onFirstAppear) * Revert "ChannelMessageList and UserMessageList: debouncedScrollToBottom; keyboardWillShowNotification/keyboardDidShowNotification" This reverts commitee1a7c4415. --------- Co-authored-by: Gnome Adrift <646322+gnomeadrift@users.noreply.github.com> Co-authored-by: Zain Kergaye <62440012+ZainKergaye@users.noreply.github.com> Co-authored-by: NillRudd <102033730+NillRudd@users.noreply.github.com> Co-authored-by: Jake-B <jake-b@users.noreply.github.com> Co-authored-by: Mike Robbins <mrobbins@alum.mit.edu>
185 lines
5.6 KiB
Swift
185 lines
5.6 KiB
Swift
//
|
|
// UserEntityExtension.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 6/3/22.
|
|
//
|
|
|
|
import Foundation
|
|
import CoreData
|
|
import MeshtasticProtobufs
|
|
|
|
extension UserEntity {
|
|
var messagePredicate: NSPredicate {
|
|
return NSPredicate(format: "((toUser == %@) OR (fromUser == %@)) AND toUser != nil AND fromUser != nil AND isEmoji == false AND admin = false AND portNum != 10", self, self)
|
|
}
|
|
|
|
var messageFetchRequest: NSFetchRequest<MessageEntity> {
|
|
let fetchRequest = MessageEntity.fetchRequest()
|
|
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
|
|
fetchRequest.predicate = messagePredicate
|
|
return fetchRequest
|
|
}
|
|
|
|
var messageList: [MessageEntity] {
|
|
let context = PersistenceController.shared.container.viewContext
|
|
let fetchRequest = messageFetchRequest
|
|
|
|
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
|
|
}
|
|
|
|
var mostRecentMessage: MessageEntity? {
|
|
// Most contacts will have no DMs history, so we can return early.
|
|
guard self.lastMessage != nil else { return nil; }
|
|
|
|
// Most recent DM for this user (descending, limit 1)
|
|
let context = PersistenceController.shared.container.viewContext
|
|
let fetchRequest = messageFetchRequest
|
|
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: false)]
|
|
fetchRequest.fetchLimit = 1
|
|
|
|
return (try? context.fetch(fetchRequest))?.first
|
|
}
|
|
|
|
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]()
|
|
}
|
|
|
|
func unreadMessages(context: NSManagedObjectContext, skipLastMessageCheck: Bool = false) -> Int {
|
|
// Most contacts will have no DMs history, so we can return early.
|
|
// (For our own node, set skipLastMessageCheck=true, because we don't update lastMessage on our own connected node.)
|
|
guard self.lastMessage != nil || skipLastMessageCheck else { return 0; }
|
|
|
|
let fetchRequest = messageFetchRequest
|
|
fetchRequest.sortDescriptors = [] // sort is irrelvant.
|
|
fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fetchRequest.predicate!, NSPredicate(format: "read == false")])
|
|
|
|
return (try? context.count(for: fetchRequest)) ?? 0
|
|
}
|
|
|
|
// Backwards-compatible property (uses viewContext)
|
|
var unreadMessages: Int { unreadMessages(context: PersistenceController.shared.container.viewContext) }
|
|
|
|
/// 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)"
|
|
}
|
|
}
|
|
}
|