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>
126 lines
3.4 KiB
Swift
126 lines
3.4 KiB
Swift
import Combine
|
|
import CoreData
|
|
import OSLog
|
|
import SwiftUI
|
|
|
|
@MainActor
|
|
class Router: ObservableObject {
|
|
|
|
@Published
|
|
var navigationState: NavigationState
|
|
|
|
private var cancellables: Set<AnyCancellable> = []
|
|
|
|
init(
|
|
navigationState: NavigationState = NavigationState(
|
|
selectedTab: .connect
|
|
)
|
|
) {
|
|
self.navigationState = navigationState
|
|
|
|
$navigationState.sink { destination in
|
|
Logger.services.info("🛣 [App] Routed to \(destination.selectedTab.rawValue, privacy: .public)")
|
|
}.store(in: &cancellables)
|
|
}
|
|
|
|
func route(url: URL) {
|
|
guard url.scheme == "meshtastic" else {
|
|
Logger.services.error("🛣 [App] Received routing URL \(url, privacy: .public) with invalid scheme. Ignoring route.")
|
|
return
|
|
}
|
|
guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
|
|
Logger.services.error("🛣 [App] Received routing URL \(url, privacy: .public) with invalid host path. Ignoring route.")
|
|
return
|
|
}
|
|
|
|
if components.path == "/messages" {
|
|
routeMessages(components)
|
|
} else if components.path == "/connect" {
|
|
navigationState.selectedTab = .connect
|
|
} else if components.path == "/nodes" {
|
|
routeNodes(components)
|
|
} else if components.path == "/map" {
|
|
routeMap(components)
|
|
} else if components.path.hasPrefix("/settings") {
|
|
routeSettings(components)
|
|
} else {
|
|
Logger.services.warning("🛣 [App] Failed to route url: \(url, privacy: .public)")
|
|
}
|
|
}
|
|
|
|
// MARK: Routing Helpers
|
|
|
|
private func routeMessages(
|
|
_ components: URLComponents
|
|
) {
|
|
let channelId = components.queryItems?
|
|
.first(where: { $0.name == "channelId" })?
|
|
.value
|
|
.flatMap(Int32.init)
|
|
let userNum = components.queryItems?
|
|
.first(where: { $0.name == "userNum" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
let messageId = components.queryItems?
|
|
.first(where: { $0.name == "messageId" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
|
|
let state: MessagesNavigationState? = if let channelId {
|
|
.channels(channelId: channelId, messageId: messageId)
|
|
} else if let userNum {
|
|
.directMessages(userNum: userNum, messageId: messageId)
|
|
} else {
|
|
nil
|
|
}
|
|
navigationState.selectedTab = .messages
|
|
navigationState.messages = state
|
|
}
|
|
|
|
private func routeNodes(_ components: URLComponents) {
|
|
let nodeId = components.queryItems?
|
|
.first(where: { $0.name == "nodenum" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
|
|
navigationState.selectedTab = .nodes
|
|
navigationState.nodeListSelectedNodeNum = nodeId
|
|
}
|
|
func navigateToNodeDetail(nodeNum: Int64) {
|
|
Logger.services.info("🛣 [App] Direct route to node detail \(nodeNum, privacy: .public)")
|
|
navigationState.selectedTab = .nodes
|
|
navigationState.nodeListSelectedNodeNum = nodeNum
|
|
}
|
|
|
|
private func routeMap(_ components: URLComponents) {
|
|
let nodeId = components.queryItems?
|
|
.first(where: { $0.name == "nodenum" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
let waypointId = components.queryItems?
|
|
.first(where: { $0.name == "waypointId" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
|
|
navigationState.selectedTab = .map
|
|
navigationState.map = if let nodeId {
|
|
.selectedNode(nodeId)
|
|
} else if let waypointId {
|
|
.waypoint(waypointId)
|
|
} else {
|
|
nil
|
|
}
|
|
}
|
|
|
|
private func routeSettings(_ components: URLComponents) {
|
|
let settingFromPath = components.path
|
|
.split(separator: "/")
|
|
.dropFirst()
|
|
.first
|
|
.flatMap(String.init)
|
|
.flatMap(SettingsNavigationState.init(rawValue:))
|
|
|
|
navigationState.selectedTab = .settings
|
|
navigationState.settings = settingFromPath
|
|
}
|
|
}
|