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

Fix misc warnings

Browse source
This commit is contained in:
Blake McAnally 2024-06-04 22:28:57 -05:00
parent 7f33422db6
commit 408f332458
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meshtastic/Export/LogDocument.swift
View file

@ -11,12 +11,10 @@ struct LogDocument: FileDocument {
}
init(configuration: ReadConfiguration) throws {
guard let data = configuration.file.regularFileContents,
let string = String(data: data, encoding: .utf8)
else {
guard let data = configuration.file.regularFileContents else {
throw CocoaError(.fileReadCorruptFile)
}
logFile = string
logFile = String(decoding: data, as: UTF8.self)
}
func fileWrapper(configuration: WriteConfiguration) throws -> FileWrapper {

2
Meshtastic/Helpers/MeshLogger.swift
View file

@ -32,7 +32,7 @@ class MeshLogger {
fileHandle.closeFile()
} else {
try data.write(to: logFile, options: .atomicWrite)
let log = String(data: data, encoding: .utf8) ?? "unknown".localized
let log = String(decoding: data, as: UTF8.self)
Logger.mesh.notice("\(log)")
}
} catch {

1
Meshtastic/Views/Messages/Messages.swift
View file

@ -73,7 +73,6 @@ struct Messages: View {
if let urlComponent = URLComponents(string: newPath ?? "") {
let queryItems = urlComponent.queryItems
let messageId = queryItems?.first(where: { $0.name == "messageId" })?.value
let channel = queryItems?.first(where: { $0.name == "channel" })?.value
if let channel {

2
Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift
View file

@ -76,7 +76,7 @@ struct MeshMapContent: MapContent {
}
}
}
.onTapGesture { location in
.onTapGesture { _ in
selectedPosition = (selectedPosition == position ? nil : position)
}
}

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

@ -58,21 +58,22 @@ struct Routes: View {
}
do {
guard let fileContent = String(data: try Data(contentsOf: selectedFile), encoding: .utf8) else { return }
let data = try Data(contentsOf: selectedFile)
let fileContent = String(decoding: data, as: UTF8.self)
let routeName = selectedFile.lastPathComponent.dropLast(4)
let lines = fileContent.components(separatedBy: "\n")
let headers = lines.first?.components(separatedBy: ",")
var latIndex = -1
var longIndex = -1
for index in headers!.indices {
Logger.services.debug("\(index): \( headers![index])")
if headers![index].trimmingCharacters(in: .whitespaces) == "Latitude" {
guard let headers = lines.first?.components(separatedBy: ",") else { return }
var latIndex: Int?
var longIndex: Int?
for index in headers.indices {
Logger.services.debug("\(index): \(headers[index])")
if headers[index].trimmingCharacters(in: .whitespaces) == "Latitude" {
latIndex = index
} else if headers![index].trimmingCharacters(in: .whitespaces) == "Longitude" {
} else if headers[index].trimmingCharacters(in: .whitespaces) == "Longitude" {
longIndex = index
}
}
if latIndex >= 0 && longIndex >= 0 {
if let latIndex, let longIndex {
let newRoute = RouteEntity(context: context)
newRoute.name = String(routeName)
newRoute.id = Int32.random(in: Int32(Int8.max) ... Int32.max)
@ -83,8 +84,8 @@ struct Routes: View {
lines.dropFirst().forEach { line in
let data = line.components(separatedBy: ",")
if data.count > 1 {
let latitude = latIndex >= 0 ? data[latIndex].trimmingCharacters(in: .whitespaces) : "0"
let longitude = longIndex >= 0 ? data[longIndex].trimmingCharacters(in: .whitespaces) : "0"
let latitude = data[latIndex].trimmingCharacters(in: .whitespaces)
let longitude = data[longIndex].trimmingCharacters(in: .whitespaces)
let loc = LocationEntity(context: context)
loc.latitudeI = Int32((Double(latitude) ?? 0) * 1e7)
loc.longitudeI = Int32((Double(longitude) ?? 0) * 1e7)