renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove force-unwrapping which may be trigger a crashing bug.

Browse Source
This commit is contained in:
Brent Simmons
2025-04-27 21:25:03 -07:00
parent eb10ccaea0
commit 2e019492f7
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iOS/MainTimeline/MainTimelineTitleView.swift
View File

@@ -10,9 +10,9 @@ import UIKit
class MainTimelineTitleView: UIView {
@IBOutlet weak var iconView: IconView!
@IBOutlet weak var label: UILabel!
@IBOutlet weak var unreadCountView: MainTimelineUnreadCountView!
@IBOutlet var iconView: IconView?
@IBOutlet var label: UILabel?
@IBOutlet var unreadCountView: MainTimelineUnreadCountView?
@available(iOS 13.4, *)
private lazy var pointerInteraction: UIPointerInteraction = {
@@ -22,9 +22,9 @@ class MainTimelineTitleView: UIView {
override var accessibilityLabel: String? {
set { }
get {
if let name = label.text {
if let name = label?.text {
let unreadLabel = NSLocalizedString("unread", comment: "Unread label for accessiblity")
return "\(name) \(unreadCountView.unreadCount) \(unreadLabel)"
return "\(name) \(unreadCountView?.unreadCount ?? 0) \(unreadLabel)"
}
else {
return nil

16
iOS/MainTimeline/MainTimelineViewController.swift
View File

@@ -540,7 +540,7 @@ class MainTimelineViewController: UITableViewController, UndoableCommandRunner {
@objc func webFeedIconDidBecomeAvailable(_ note: Notification) {
if let titleView = navigationItem.titleView as? MainTimelineTitleView {
titleView.iconView.iconImage = timelineIconImage
titleView.iconView?.iconImage = timelineIconImage
}
guard let feed = note.userInfo?[UserInfoKey.webFeed] as? WebFeed else {
@@ -574,7 +574,7 @@ class MainTimelineViewController: UITableViewController, UndoableCommandRunner {
@objc func faviconDidBecomeAvailable(_ note: Notification) {
if let titleView = navigationItem.titleView as? MainTimelineTitleView {
titleView.iconView.iconImage = timelineIconImage
titleView.iconView?.iconImage = timelineIconImage
}
if showIcons {
queueReloadAvailableCells()
@@ -599,7 +599,7 @@ class MainTimelineViewController: UITableViewController, UndoableCommandRunner {
@objc func displayNameDidChange(_ note: Notification) {
if let titleView = navigationItem.titleView as? MainTimelineTitleView {
titleView.label.text = timelineFeed?.nameForDisplay
titleView.label?.text = timelineFeed?.nameForDisplay
}
}
@@ -714,14 +714,14 @@ private extension MainTimelineViewController {
title = timelineFeed?.nameForDisplay ?? "Timeline"
if let titleView = navigationItem.titleView as? MainTimelineTitleView {
titleView.iconView.iconImage = timelineIconImage
titleView.iconView?.iconImage = timelineIconImage
if let preferredColor = timelineIconImage?.preferredColor {
titleView.iconView.tintColor = UIColor(cgColor: preferredColor)
titleView.iconView?.tintColor = UIColor(cgColor: preferredColor)
} else {
titleView.iconView.tintColor = nil
titleView.iconView?.tintColor = nil
}
titleView.label.text = timelineFeed?.nameForDisplay
titleView.label?.text = timelineFeed?.nameForDisplay
updateTitleUnreadCount()
if timelineFeed is WebFeed {
@@ -782,7 +782,7 @@ private extension MainTimelineViewController {
func updateTitleUnreadCount() {
if let titleView = navigationItem.titleView as? MainTimelineTitleView {
titleView.unreadCountView.unreadCount = coordinator?.timelineUnreadCount ?? 0
titleView.unreadCountView?.unreadCount = coordinator?.timelineUnreadCount ?? 0
}
}