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

Bump versions

Browse source
This commit is contained in:
Garth Vander Houwen 2024-08-16 07:55:23 -07:00
parent bbc6d4d40a
commit 0ac32df941
7 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Localizable.xcstrings
View file

@ -6316,7 +6316,7 @@
"Direct Message Help" : {
},
"Direct messages are using the new public key infrastructure to encrypt the message." : {
"Direct messages are using the new public key infrastructure for encryption." : {
},
"Direct messages are using the shared key for the channel." : {
@ -10790,9 +10790,6 @@
},
"Key" : {
},
"Key does not match the public key that was used previously, delete the node and let it negotatiate keys again." : {
},
"Key Mapping" : {

8
Meshtastic.xcodeproj/project.pbxproj
View file

@ -1649,7 +1649,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.4.2;
MARKETING_VERSION = 2.5.0;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -1684,7 +1684,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.4.2;
MARKETING_VERSION = 2.5.0;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -1716,7 +1716,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.4.2;
MARKETING_VERSION = 2.5.0;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -1749,7 +1749,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.4.2;
MARKETING_VERSION = 2.5.0;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

37
Meshtastic/Enums/RoutingError.swift
View file

@ -73,11 +73,11 @@ enum RoutingError: Int, CaseIterable, Identifiable {
case .noInterface:
return Color.red
case .maxRetransmit:
return Color.red
return Color.orange
case .noChannel:
return Color.orange
case .tooLarge:
return Color.orange
return Color.red
case .noResponse:
return Color.orange
case .dutyCycleLimit:
@ -92,6 +92,39 @@ enum RoutingError: Int, CaseIterable, Identifiable {
return Color.red
}
}
var canRetry: Bool {
switch self {
case .none:
return false
case .noRoute:
return false
case .gotNak:
return false
case .timeout:
return true
case .noInterface:
return false
case .maxRetransmit:
return true
case .noChannel:
return true
case .tooLarge:
return false
case .noResponse:
return true
case .dutyCycleLimit:
return true
case .badRequest:
return false
case .notAuthorized:
return false
case .pkiFailed:
return false
case .pkiUnknownPubkey:
return false
}
}
func protoEnumValue() -> Routing.Error {
switch self {

2
Meshtastic/Views/Helpers/Help/DirectMessagesHelp.swift
View file

@ -13,7 +13,7 @@ struct DirectMessagesHelp: View {
var body: some View {
ScrollView {
Text("Direct Message Help")
Label("Direct Message Help", systemImage: "questionmark.circle")
.font(.title)
.padding(.vertical)
VStack(alignment: .leading) {

2
Meshtastic/Views/Helpers/Help/LockLegend.swift
View file

@ -34,7 +34,7 @@ struct LockLegend: View {
Text("Public Key Encryption")
.fontWeight(.semibold)
}
Text("Direct messages are using the new public key infrastructure to encrypt the message.")
Text("Direct messages are using the new public key infrastructure for encryption.")
.allowsTightening(/*@START_MENU_TOKEN@*/true/*@END_MENU_TOKEN@*/)
.font(.callout)
.fixedSize(horizontal: false, vertical: true)

2
Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
View file

@ -51,7 +51,7 @@ struct NodeDetail: View {
Text("Public Key Mismatch")
.font(.title3)
.foregroundStyle(.red)
Text("Key does not match the public key that was used previously, delete the node and let it negotatiate keys again.")
Text("The public key does not match the recorded key. You may delete the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action.")
.font(.caption)
.foregroundStyle(.red)
}

2
Meshtastic/Views/Settings/Firmware.swift
View file

@ -13,7 +13,7 @@ struct Firmware: View {
@Environment(\.managedObjectContext) var context
@EnvironmentObject var bleManager: BLEManager
var node: NodeInfoEntity?
@State var minimumVersion = "2.4.3"
@State var minimumVersion = "2.4.2"
@State var version = ""
@State private var currentDevice: DeviceHardware?
@State private var latestStable: FirmwareRelease?