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>
161 lines
5.6 KiB
Swift
161 lines
5.6 KiB
Swift
import MeshtasticProtobufs
|
|
import OSLog
|
|
import SwiftUI
|
|
import DatadogSessionReplay
|
|
|
|
struct MessageText: View {
|
|
static let linkBlue = Color(red: 0.4627, green: 0.8392, blue: 1) /* #76d6ff */
|
|
static let localeDateFormat = DateFormatter.dateFormat(
|
|
fromTemplate: "yyMMddjmmssa",
|
|
options: 0,
|
|
locale: Locale.current
|
|
)
|
|
static let localeTimeFormat = DateFormatter.dateFormat(
|
|
fromTemplate: "jmmssa",
|
|
options: 0,
|
|
locale: Locale.current
|
|
)
|
|
static let dateFormatString = (localeDateFormat ?? "MM/dd/YY j:mm:ss:a")
|
|
static let timeFormatString = (localeTimeFormat ?? "j:mm:ss:a")
|
|
@Environment(\.managedObjectContext) var context
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
|
|
let message: MessageEntity
|
|
let tapBackDestination: MessageDestination
|
|
let isCurrentUser: Bool
|
|
let onReply: () -> Void
|
|
// State for handling channel URL sheet
|
|
@State private var saveChannelLink: SaveChannelLinkData?
|
|
@State private var isShowingDeleteConfirmation = false
|
|
|
|
var body: some View {
|
|
|
|
SessionReplayPrivacyView(textAndInputPrivacy: .maskAll) {
|
|
|
|
let markdownText = LocalizedStringKey(message.messagePayloadMarkdown ?? (message.messagePayload ?? "EMPTY MESSAGE"))
|
|
return Text(markdownText)
|
|
.tint(Self.linkBlue)
|
|
.padding(.vertical, 10)
|
|
.padding(.horizontal, 8)
|
|
.foregroundColor(.white)
|
|
.background(isCurrentUser ? .accentColor : Color(.gray))
|
|
.cornerRadius(15)
|
|
.overlay {
|
|
/// Show the lock if the message is pki encrypted and has a real ack if sent by the current user, or is pki encrypted for incoming messages
|
|
if message.pkiEncrypted && message.realACK || !isCurrentUser && message.pkiEncrypted {
|
|
VStack(alignment: .trailing) {
|
|
Spacer()
|
|
HStack {
|
|
Spacer()
|
|
Image(systemName: "lock.circle.fill")
|
|
.symbolRenderingMode(.palette)
|
|
.foregroundStyle(.white, .green)
|
|
.font(.system(size: 20))
|
|
.offset(x: 8, y: 8)
|
|
}
|
|
}
|
|
}
|
|
let isStoreAndForward = message.portNum == Int32(PortNum.storeForwardApp.rawValue)
|
|
let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
|
|
if isStoreAndForward {
|
|
VStack(alignment: .trailing) {
|
|
Spacer()
|
|
HStack {
|
|
Spacer()
|
|
Image(systemName: "envelope.circle.fill")
|
|
.symbolRenderingMode(.palette)
|
|
.foregroundStyle(.white, .gray)
|
|
.font(.system(size: 20))
|
|
.offset(x: 8, y: 8)
|
|
}
|
|
}
|
|
}
|
|
if tapBackDestination.overlaySensorMessage {
|
|
VStack {
|
|
isDetectionSensorMessage ? Image(systemName: "sensor.fill")
|
|
.padding()
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing)
|
|
.foregroundStyle(Color.orange)
|
|
.symbolRenderingMode(.multicolor)
|
|
.symbolEffect(.variableColor.reversing.cumulative, options: .repeat(20).speed(3))
|
|
.offset(x: 20, y: -20)
|
|
: nil
|
|
}
|
|
} else {
|
|
EmptyView()
|
|
}
|
|
}
|
|
.contextMenu {
|
|
MessageContextMenuItems(
|
|
message: message,
|
|
tapBackDestination: tapBackDestination,
|
|
isCurrentUser: isCurrentUser,
|
|
isShowingDeleteConfirmation: $isShowingDeleteConfirmation,
|
|
onReply: onReply
|
|
)
|
|
}
|
|
.environment(\.openURL, OpenURLAction { url in
|
|
saveChannelLink = nil
|
|
var addChannels = false
|
|
if url.absoluteString.lowercased().contains("meshtastic.org/v/#") {
|
|
// Handle contact URL
|
|
ContactURLHandler.handleContactUrl(url: url, accessoryManager: AccessoryManager.shared)
|
|
return .handled // Prevent default browser opening
|
|
} else if url.absoluteString.lowercased().contains("meshtastic.org/e/") {
|
|
// Handle channel URL
|
|
let components = url.absoluteString.components(separatedBy: "#")
|
|
guard !components.isEmpty, let lastComponent = components.last else {
|
|
Logger.services.error("No valid components found in channel URL: \(url.absoluteString, privacy: .public)")
|
|
return .discarded
|
|
}
|
|
addChannels = Bool(url.query?.contains("add=true") ?? false)
|
|
guard let lastComponent = components.last else {
|
|
Logger.services.error("Channel URL missing fragment component: \(url.absoluteString, privacy: .public)")
|
|
self.saveChannelLink = nil
|
|
return .discarded
|
|
}
|
|
let cs = lastComponent.components(separatedBy: "?").first ?? ""
|
|
self.saveChannelLink = SaveChannelLinkData(data: cs, add: addChannels)
|
|
Logger.services.debug("Add Channel: \(addChannels, privacy: .public)")
|
|
Logger.mesh.debug("Opening Channel Settings URL: \(url.absoluteString, privacy: .public)")
|
|
return .handled // Prevent default browser opening
|
|
}
|
|
return .systemAction // Open other URLs in browser
|
|
})
|
|
// Display sheet for channel settings
|
|
.sheet(item: $saveChannelLink) { link in
|
|
SaveChannelQRCode(
|
|
channelSetLink: link.data,
|
|
addChannels: link.add,
|
|
accessoryManager: accessoryManager
|
|
)
|
|
.presentationDetents([.large])
|
|
.presentationDragIndicator(.visible)
|
|
}
|
|
.confirmationDialog(
|
|
"Are you sure you want to delete this message?",
|
|
isPresented: $isShowingDeleteConfirmation,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button("Delete Message", role: .destructive) {
|
|
context.delete(message)
|
|
do {
|
|
try context.save()
|
|
} catch {
|
|
Logger.data.error("Failed to delete message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
|
|
}
|
|
}
|
|
Button("Cancel", role: .cancel) {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension MessageDestination {
|
|
var overlaySensorMessage: Bool {
|
|
switch self {
|
|
case .user: return false
|
|
case .channel: return true
|
|
}
|
|
}
|
|
}
|