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>
62 lines
2.2 KiB
Swift
62 lines
2.2 KiB
Swift
//
|
|
// ChannelEntityExtension.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 11/7/22.
|
|
//
|
|
import Foundation
|
|
import CoreData
|
|
import MeshtasticProtobufs
|
|
|
|
extension ChannelEntity {
|
|
var messagePredicate: NSPredicate {
|
|
return NSPredicate(format: "channel == %ld AND toUser == nil AND isEmoji == false", self.index)
|
|
}
|
|
|
|
var messageFetchRequest: NSFetchRequest<MessageEntity> {
|
|
let fetchRequest = MessageEntity.fetchRequest()
|
|
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
|
|
fetchRequest.predicate = messagePredicate
|
|
return fetchRequest
|
|
}
|
|
|
|
var allPrivateMessages: [MessageEntity] {
|
|
let context = PersistenceController.shared.container.viewContext
|
|
let fetchRequest = messageFetchRequest
|
|
|
|
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
|
|
}
|
|
|
|
var mostRecentPrivateMessage: MessageEntity? {
|
|
// Most recent channel message (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
|
|
}
|
|
|
|
func unreadMessages(context: NSManagedObjectContext) -> Int {
|
|
let context = PersistenceController.shared.container.viewContext
|
|
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) }
|
|
|
|
var protoBuf: Channel {
|
|
var channel = Channel()
|
|
channel.index = self.index
|
|
channel.settings.name = self.name ?? ""
|
|
channel.settings.psk = self.psk ?? Data()
|
|
channel.role = Channel.Role(rawValue: Int(self.role)) ?? Channel.Role.secondary
|
|
channel.settings.moduleSettings.positionPrecision = UInt32(self.positionPrecision)
|
|
channel.settings.moduleSettings.isClientMuted = self.mute
|
|
return channel
|
|
}
|
|
}
|