meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into pki

Browse source
This commit is contained in:
Garth Vander Houwen 2024-08-19 16:06:23 -07:00 • committed by GitHub
commit 2bbaada3cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Extensions/CoreData/ChannelEntityExtension.swift
View file

@ -14,7 +14,7 @@ extension ChannelEntity {
let context = PersistenceController.shared.container.viewContext
let fetchRequest = MessageEntity.fetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
fetchRequest.predicate = NSPredicate(format: "channel == %ld AND toUser == nil AND isEmoji == false", self.index)
fetchRequest.predicate = NSPredicate(format: "channel == %ld AND toUser == nil AND isEmoji == false", self.index)
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
}

1
Meshtastic/Extensions/CoreData/MyInfoEntityExtension.swift
View file

@ -22,6 +22,7 @@ extension MyInfoEntity {
let unreadMessages = messageList.filter { ($0 as AnyObject).read == false && ($0 as AnyObject).isEmoji == false }
return unreadMessages.count
}
var hasAdmin: Bool {
let adminChannel = channels?.filter { ($0 as AnyObject).name?.lowercased() == "admin" }
return adminChannel?.count ?? 0 > 0

5
Meshtastic/Views/Settings/Config/DeviceConfig.swift
View file

@ -282,6 +282,11 @@ struct DeviceConfig: View {
.onChange(of: tzdef) { newTzdef in
if newTzdef != node?.deviceConfig?.tzdef { hasChanges = true }
}
.onChange(of: ledHeartbeatEnabled) { newLedHeartbeatEnabled in
if node != nil && node?.deviceConfig != nil {
if newLedHeartbeatEnabled != node!.deviceConfig!.ledHeartbeatEnabled { hasChanges = true }
}
}
}
func setDeviceValues() {
self.deviceRole = Int(node?.deviceConfig?.role ?? 0)

2
Meshtastic/Views/Settings/Config/LoRaConfig.swift
View file

@ -49,6 +49,8 @@ struct LoRaConfig: View {
let floatFormatter: NumberFormatter = {
let formatter = NumberFormatter()
formatter.numberStyle = .decimal
formatter.allowsFloats = true
formatter.maximumFractionDigits = 4
return formatter
}()

1
Meshtastic/Views/Settings/Routes.swift
View file

@ -58,6 +58,7 @@ struct Routes: View {
}
do {
guard let fileContent = String(data: try Data(contentsOf: selectedFile), encoding: .utf8) else { return }
let routeName = selectedFile.lastPathComponent.dropLast(4)
let lines = fileContent.components(separatedBy: "\n")