Merge pull request #864 from meshtastic/message-sort

0 Message Time Logic

Meshtastic/Extensions/CoreData/ChannelEntityExtension.swift

@@ -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]()
 	}

Meshtastic/Extensions/CoreData/MyInfoEntityExtension.swift

@@ -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

Meshtastic/Helpers/MeshPackets.swift

@@ -808,7 +808,11 @@ func textMessageAppPacket(
 			let fetchedUsers = try context.fetch(messageUsers)
 			let newMessage = MessageEntity(context: context)
 			newMessage.messageId = Int64(packet.id)
-			newMessage.messageTimestamp = Int32(bitPattern: packet.rxTime)
+			if packet.rxTime == 0 {
+				newMessage.messageTimestamp = Int32(Date().timeIntervalSince1970)
+			} else {
+				newMessage.messageTimestamp = Int32(packet.rxTime)
+			}
 			newMessage.receivedACK = false
 			newMessage.snr = packet.rxSnr
 			newMessage.rssi = packet.rxRssi

Meshtastic/Views/ContentView.swift

@@ -8,7 +8,7 @@ import SwiftUI
 struct ContentView: View {
 	@ObservedObject
 	var appState: AppState
-	
+
 	@ObservedObject
 	var router: Router
 

Meshtastic/Views/Nodes/NodeList.swift

@@ -37,7 +37,6 @@ struct NodeList: View {
 	@State private var isPresentingDeleteNodeAlert = false
 	@State private var deleteNodeId: Int64 = 0
 
-
 	var boolFilters: [Bool] {[
 		isOnline,
 		isFavorite,

Meshtastic/Views/Settings/Routes.swift

@@ -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")