github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 18:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(apple/macOS): Don't force unwrap for menubar items (#8135)

Browse Source 
We can elegantly handle nil items in places where we currently don't.
This PR updates all cases in MenuBar.swift to gracefully handle nil
items like the menubar icons which can, in rare circumstances, be `nil`
if they haven't yet loaded.
This commit is contained in:
Jamil
2025-02-14 13:50:35 -08:00
committed by GitHub
parent 5efb4b0fe2
commit df8b615d35
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swift/apple/FirezoneKit/Sources/FirezoneKit/Views/MenuBar.swift
View File

@@ -384,7 +384,7 @@ public final class MenuBar: NSObject, ObservableObject {
private func getStatusIcon(status: NEVPNStatus?, notification: Bool) -> NSImage? {
if status == .connecting || status == .disconnecting || status == .reasserting {
return self.connectingAnimationImages.last!
return self.connectingAnimationImages.last ?? nil
}
switch status {
@@ -696,7 +696,7 @@ public final class MenuBar: NSObject, ObservableObject {
}
} else {
// Show Address first if addressDescription is missing
resourceAddressDescriptionItem.title = resource.address! // Address is none only for non-internet resource
resourceAddressDescriptionItem.title = resource.address ?? "" // Address is none only for internet resource
resourceAddressDescriptionItem.action = #selector(resourceValueTapped(_:))
}
resourceAddressDescriptionItem.isEnabled = true