From b61f59d4067534c7db5a3abc97f97e20689ac142 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 21 Jun 2022 20:15:35 -0700 Subject: [PATCH] 1.2.21 --- Meshtastic Apple.xcodeproj/project.pbxproj | 8 ++---- MeshtasticApple/Helpers/ChannelHelper.swift | 26 ------------------- .../Views/Settings/LoRaConfig.swift | 2 +- .../Views/Settings/ShareChannel.swift | 2 -- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 MeshtasticApple/Helpers/ChannelHelper.swift diff --git a/Meshtastic Apple.xcodeproj/project.pbxproj b/Meshtastic Apple.xcodeproj/project.pbxproj index edbac879..1a556d63 100644 --- a/Meshtastic Apple.xcodeproj/project.pbxproj +++ b/Meshtastic Apple.xcodeproj/project.pbxproj @@ -69,7 +69,6 @@ DDCFF601285453A7005FA625 /* localonly.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCFF600285453A7005FA625 /* localonly.pb.swift */; }; DDD94A502845C8F5004A87A0 /* DateTimeText.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD94A4F2845C8F5004A87A0 /* DateTimeText.swift */; }; DDD9E4E4284B208E003777C5 /* UserEntityExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD9E4E3284B208E003777C5 /* UserEntityExtension.swift */; }; - DDE393BA284E535700473991 /* ChannelHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDE393B9284E535700473991 /* ChannelHelper.swift */; }; DDF924CA26FBB953009FE055 /* ConnectedDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C926FBB953009FE055 /* ConnectedDevice.swift */; }; /* End PBXBuildFile section */ @@ -161,7 +160,6 @@ DDCFF600285453A7005FA625 /* localonly.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = localonly.pb.swift; sourceTree = ""; }; DDD94A4F2845C8F5004A87A0 /* DateTimeText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTimeText.swift; sourceTree = ""; }; DDD9E4E3284B208E003777C5 /* UserEntityExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserEntityExtension.swift; sourceTree = ""; }; - DDE393B9284E535700473991 /* ChannelHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelHelper.swift; sourceTree = ""; }; DDF924C926FBB953009FE055 /* ConnectedDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectedDevice.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -405,7 +403,6 @@ DD913638270DFF4C00D7ACF3 /* LocalNotificationManager.swift */, DD8169F8271F1A6100F4AB02 /* MeshLogger.swift */, DDA6B2E828419CF2003E8C16 /* MeshPackets.swift */, - DDE393B9284E535700473991 /* ChannelHelper.swift */, ); path = Helpers; sourceTree = ""; @@ -625,7 +622,6 @@ DD2E65262767A01F00E45FC5 /* NodeDetail.swift in Sources */, DDA6B2E928419CF2003E8C16 /* MeshPackets.swift in Sources */, DDD94A502845C8F5004A87A0 /* DateTimeText.swift in Sources */, - DDE393BA284E535700473991 /* ChannelHelper.swift in Sources */, C9A88B57278B559900BD810A /* apponly.pb.swift in Sources */, DD4C158E2824AA7E0032668E /* config.pb.swift in Sources */, DD47E3D926F3093800029299 /* MessageBubble.swift in Sources */, @@ -810,7 +806,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.20; + MARKETING_VERSION = 1.3.21; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -841,7 +837,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.20; + MARKETING_VERSION = 1.3.21; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; diff --git a/MeshtasticApple/Helpers/ChannelHelper.swift b/MeshtasticApple/Helpers/ChannelHelper.swift deleted file mode 100644 index 5fb8903e..00000000 --- a/MeshtasticApple/Helpers/ChannelHelper.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// ChannelHelper.swift -// MeshtasticApple -// -// Created by Garth Vander Houwen on 6/6/22. -// - -//import Foundation -// -// -//private fun urlToChannels(url: Uri): AppOnlyProtos.ChannelSet { -// val urlStr = url.toString() -// -// val pathRegex = Regex("$prefix(.*)", RegexOption.IGNORE_CASE) -// val (base64) = pathRegex.find(urlStr)?.destructured -// ?: throw MalformedURLException("Not a meshtastic URL: ${urlStr.take(40)}") -// val bytes = Base64.decode(base64, base64Flags) -// -// return AppOnlyProtos.ChannelSet.parseFrom(bytes) -// } -// -//func urlToChannels(url: URL) { -// -// let urlString = url.absoluteString -// -//} diff --git a/MeshtasticApple/Views/Settings/LoRaConfig.swift b/MeshtasticApple/Views/Settings/LoRaConfig.swift index dcb78a37..ac72e8d6 100644 --- a/MeshtasticApple/Views/Settings/LoRaConfig.swift +++ b/MeshtasticApple/Views/Settings/LoRaConfig.swift @@ -231,7 +231,7 @@ struct LoRaConfig: View { } } .pickerStyle(DefaultPickerStyle()) - Text("Sets the maximum number of hops, default is 3.") + Text("Sets the maximum number of hops, default is 3. Increasing hops also increases air time utilization and should be used carefully.") .font(.caption) .listRowSeparator(.visible) } diff --git a/MeshtasticApple/Views/Settings/ShareChannel.swift b/MeshtasticApple/Views/Settings/ShareChannel.swift index 3a7b2bfe..5ae5dfa1 100644 --- a/MeshtasticApple/Views/Settings/ShareChannel.swift +++ b/MeshtasticApple/Views/Settings/ShareChannel.swift @@ -36,8 +36,6 @@ struct ShareChannel: View { @Environment(\.managedObjectContext) var context @EnvironmentObject var bleManager: BLEManager @EnvironmentObject var userSettings: UserSettings - - let channelSet = ChannelSet() @State private var text = "https://meshtastic.org/e/#test" var qrCodeImage = QrCodeImage()